Merge branch 'master' of https://github.com/microsoft/InventorySample

microsoft · Aug 6, 2019 · 4a709cd · 4a709cd
2 parents 47ae405 + 8f59e7f
commit 4a709cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Inventory.App/Converters/Int64Converter.cs b/src/Inventory.App/Converters/Int64Converter.cs
@@ -26,15 +26,15 @@ public object Convert(object value, Type targetType, object parameter, string la
             {
                 if (targetType == typeof(String))
                 {
-                    return n64 == 0 ? "" : n64.ToString();
+                    return n64 == 0L ? "" : n64.ToString();
                 }
                 return n64;
             }
             if (targetType == typeof(String))
             {
                 return "";
             }
-            return 0;
+            return 0L;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)
@@ -46,7 +46,7 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
                     return n64;
                 }
             }
-            return 0;
+            return 0L;
         }
     }
 }
diff --git a/src/Inventory.App/Views/Shell/ShellView.xaml.cs b/src/Inventory.App/Views/Shell/ShellView.xaml.cs
@@ -65,7 +65,6 @@ private void OnViewConsolidated(ApplicationView sender, ApplicationViewConsolida
             var appView = ApplicationView.GetForCurrentView();
             appView.Consolidated -= OnViewConsolidated;
             ServiceLocator.DisposeCurrent();
-            Window.Current.Close();
         }
 
         private async void OnUnlockClick(object sender, Windows.UI.Xaml.RoutedEventArgs e)