Do not go to system database if we aren't actually navigating from a …

…page
ravendb · Jul 28, 2014 · e2b2926 · e2b2926
1 parent 8b109a3
commit e2b2926
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Raven.Studio/MainPage.xaml.cs b/Raven.Studio/MainPage.xaml.cs
@@ -27,7 +27,8 @@ private void ContentFrame_Navigated(object sender, NavigationEventArgs e)
 			HighlightCurrentPage(e.Uri);
 
 			// update the current database here so that back button navigation works correctly with database changes
-			ApplicationModel.Current.Server.Value.SetCurrentDatabase(new UrlParser(e.Uri.OriginalString));
+			if (string.IsNullOrEmpty(e.Uri.OriginalString) == false)
+				ApplicationModel.Current.Server.Value.SetCurrentDatabase(new UrlParser(e.Uri.OriginalString));
 
 			GC.Collect();
 		}