Kenric Nugteren hace 2 años
padre
commit
0c140dece3

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

@@ -166,9 +166,16 @@ namespace PRSDesktop
                     //var url = App.DatabaseSettings.URLs.FirstOrDefault() ?? "localhost:8000";
                     //ClientFactory.SetClientType(typeof(RPCClient<>), Platform.Wpf, CoreUtils.GetVersion(), () => new RPCClientSocketTransport(url));
                     
-                    var url = RestClient<User>.Ping(App.DatabaseSettings.URLs, out DatabaseInfo info);
-                    ClientFactory.SetClientType(typeof(RestClient<>), Platform.Wpf, CoreUtils.GetVersion(), 
-                        url, true);
+                    var url = RestClient<User>.Ping(App.DatabaseSettings.URLs);
+                    if(url is null)
+                    {
+                        MessageBox.Show("Server is unavailable!");
+                        return;
+                    }
+                    else
+                    {
+                        ClientFactory.SetClientType(typeof(RestClient<>), Platform.Wpf, CoreUtils.GetVersion(), url, true);
+                    }
                     break;
                 
                 case DatabaseType.Local:

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

@@ -135,7 +135,7 @@ namespace PRSDesktop
                         if (db.DatabaseType == DatabaseType.Local)
                             info = new IPCClient<User>(DatabaseServerProperties.GetPipeName(db.LocalServerName)).Info();
                         else if (db.DatabaseType == DatabaseType.Networked)
-                            RestClient<User>.Ping(db.URLs, out info);
+                            RestClient<User>.Info(db.URLs, out info);
                         UpdateInfo(key, db, info, border, image, dbver);
                     });
 

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "7.16a"
+#define MyAppVersion "7.16b"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

+ 1 - 1
prs.server/PRSServer.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "7.16a"
+#define MyAppVersion "7.16b"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"