Explorar o código

Using database ID

Kenric Nugteren hai 1 ano
pai
achega
d9882cbc21
Modificáronse 2 ficheiros con 8 adicións e 3 borrados
  1. 3 2
      prs.desktop/MainWindow.xaml.cs
  2. 5 1
      prs.desktop/Utils/SelectDatabase.xaml.cs

+ 3 - 2
prs.desktop/MainWindow.xaml.cs

@@ -156,8 +156,6 @@ namespace PRSDesktop
             HotKeyManager.RegisterHotKey(Key.F6, ShowRecordingNotes);
             HotKeyManager.RegisterHotKey(Key.F4, ToggleRecordingAudio);
 
-            DocumentCaches.ServerName = App.Profile;
-
             var settings = App.DatabaseSettings;
             bool dbConnected;
             DatabaseType = settings.DatabaseType;
@@ -231,6 +229,7 @@ namespace PRSDesktop
             try
             {
                 var dbInfo = new Client<User>().Info();
+                ClientFactory.DatabaseID = dbInfo.DatabaseID;
                 ThemeManager.BaseColor = (Color)ColorConverter.ConvertFromString(dbInfo.ColorScheme);
                 if (dbInfo.Logo?.Any() == true)
                     using (var ms = new MemoryStream(dbInfo.Logo))
@@ -1711,6 +1710,8 @@ namespace PRSDesktop
             progress.Report("Starting Local Database");
             DbFactory.Start();
 
+            ClientFactory.DatabaseID = DbFactory.ID;
+
             progress.Report("Checking Database");
 
             var users = DbFactory.Provider.Load<User>();

+ 5 - 1
prs.desktop/Utils/SelectDatabase.xaml.cs

@@ -138,8 +138,12 @@ namespace PRSDesktop
                         {
                             while (!cancel.IsCancellationRequested)
                             {
-                                DatabaseInfo? info = new DatabaseInfo(db.ColorScheme, db.Logo, CoreUtils.GetVersion(), true, DbFactory.RestPort, DbFactory.RPCPort);
+                                DatabaseInfo? info = null;
 
+                                if(db.DatabaseType == DatabaseType.Standalone)
+                                {
+                                    info = new DatabaseInfo(db.ColorScheme, db.Logo, CoreUtils.GetVersion(), true, DbFactory.RestPort, DbFactory.RPCPort, DbFactory.ID);
+                                }
                                 if (db.DatabaseType == DatabaseType.Local)
                                 {
                                     info = new IPCClient<User>(DatabaseServerProperties.GetPipeName(db.LocalServerName, false)).Info();