diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 3b96f3b76..01cd06c14 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -2,6 +2,7 @@
Fixed issue MR-392 - Sessions Panel - context menu entries need to be context aware
Fixed issue MR-422 - Gives error Object reference not set to an instance of an object.
Fixed issue MR-424 - Import of a few Linux SSH2 hosts discovered via the port scan tool results in a UE
+ Fixed issue MR-439 - MRemoteNG 1.70 does not start
Added PuTTY Session Settings command to the Config panel for PuTTY Saved Sessions.
Fixed an exception or crash when choosing unnamed colors for themes.
Fixed possible error "Control does not support transparent background colors" when modifying themes.
diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
index 9d3e285ff..e1d7aae4e 100644
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -1100,14 +1100,31 @@ Namespace App
TimerSqlWatcher.Start()
End If
Catch ex As Exception
- MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Language.strConnectionsFileCouldNotBeLoaded & vbNewLine & ex.Message & ex.StackTrace, conL.ConnectionFileName))
- If My.Settings.UseSQLServer = False Then
+ If My.Settings.UseSQLServer Then
+ MessageCollector.AddExceptionMessage(My.Language.strLoadFromSqlFailed, ex)
+ Dim commandButtons As String = String.Join("|", {My.Language.strCommandTryAgain, My.Language.strCommandOpenConnectionFile, String.Format(My.Language.strCommandExitProgram, Application.ProductName)})
+ cTaskDialog.ShowCommandBox(Application.ProductName, My.Language.strLoadFromSqlFailed, My.Language.strLoadFromSqlFailedContent, Misc.GetExceptionMessageRecursive(ex), "", "", commandButtons, False, eSysIcons.Error, Nothing)
+ Select Case cTaskDialog.CommandButtonResult
+ Case 0
+ LoadConnections(WithDialog, Update)
+ Return
+ Case 1
+ My.Settings.UseSQLServer = False
+ LoadConnections(True, Update)
+ Return
+ Case Else
+ Application.Exit()
+ Return
+ End Select
+ Else
+ MessageCollector.AddExceptionMessage(String.Format(My.Language.strConnectionsFileCouldNotBeLoaded, conL.ConnectionFileName), ex)
If Not conL.ConnectionFileName = GetStartupConnectionFileName() Then
- LoadConnections()
- Exit Sub
+ LoadConnections(WithDialog, Update)
+ Return
Else
- MsgBox(String.Format(My.Language.strErrorStartupConnectionFileLoad, vbNewLine, Application.ProductName, GetStartupConnectionFileName(), ex.Message), MsgBoxStyle.OkOnly + MsgBoxStyle.Critical)
+ MsgBox(String.Format(My.Language.strErrorStartupConnectionFileLoad, vbNewLine, Application.ProductName, GetStartupConnectionFileName(), Misc.GetExceptionMessageRecursive(ex)), MsgBoxStyle.OkOnly + MsgBoxStyle.Critical)
Application.Exit()
+ Return
End If
End If
End Try
diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb
index 137d4681b..20a6a01b1 100644
--- a/mRemoteV1/Config/Config.Connections.Load.vb
+++ b/mRemoteV1/Config/Config.Connections.Load.vb
@@ -276,7 +276,7 @@ Namespace Config
App.Runtime.IsConnectionsFileLoaded = True
'App.Runtime.Windows.treeForm.InitialRefresh()
Catch ex As Exception
- MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLoadFromSqlFailed & vbNewLine & ex.Message, True)
+ Throw
Finally
If sqlCon IsNot Nothing Then
sqlCon.Close()
diff --git a/mRemoteV1/Language/Language.Designer.vb b/mRemoteV1/Language/Language.Designer.vb
index 8750175e8..9937cc8b4 100644
--- a/mRemoteV1/Language/Language.Designer.vb
+++ b/mRemoteV1/Language/Language.Designer.vb
@@ -918,6 +918,15 @@ Namespace My
End Get
End Property
+ '''
+ ''' Looks up a localized string similar to E&xit {0}.
+ '''
+ Friend Shared ReadOnly Property strCommandExitProgram() As String
+ Get
+ Return ResourceManager.GetString("strCommandExitProgram", resourceCulture)
+ End Get
+ End Property
+
'''
''' Looks up a localized string similar to Couldn't parse command line args!.
'''
@@ -927,6 +936,24 @@ Namespace My
End Get
End Property
+ '''
+ ''' Looks up a localized string similar to &Open a connection file.
+ '''
+ Friend Shared ReadOnly Property strCommandOpenConnectionFile() As String
+ Get
+ Return ResourceManager.GetString("strCommandOpenConnectionFile", resourceCulture)
+ End Get
+ End Property
+
+ '''
+ ''' Looks up a localized string similar to &Try again.
+ '''
+ Friend Shared ReadOnly Property strCommandTryAgain() As String
+ Get
+ Return ResourceManager.GetString("strCommandTryAgain", resourceCulture)
+ End Get
+ End Property
+
'''
''' Looks up a localized string similar to {0} has detected the Lenovo Auto Scroll Utility running on this system. This utility is known to cause problems with {0}. It is recommended that you disable or uninstall it..
'''
@@ -2393,7 +2420,7 @@ Namespace My
End Property
'''
- ''' Looks up a localized string similar to Load From SQL failed!.
+ ''' Looks up a localized string similar to Load from SQL failed.
'''
Friend Shared ReadOnly Property strLoadFromSqlFailed() As String
Get
@@ -2401,6 +2428,15 @@ Namespace My
End Get
End Property
+ '''
+ ''' Looks up a localized string similar to The connection information could not be loaded from the SQL server..
+ '''
+ Friend Shared ReadOnly Property strLoadFromSqlFailedContent() As String
+ Get
+ Return ResourceManager.GetString("strLoadFromSqlFailedContent", resourceCulture)
+ End Get
+ End Property
+
'''
''' Looks up a localized string similar to Load From XML failed!.
'''
diff --git a/mRemoteV1/Language/Language.resx b/mRemoteV1/Language/Language.resx
index bc0e4cb8f..826bae565 100644
--- a/mRemoteV1/Language/Language.resx
+++ b/mRemoteV1/Language/Language.resx
@@ -414,9 +414,18 @@ VncSharpNG Control Version {0}
Wait For Exit
+
+ E&xit {0}
+
Couldn't parse command line args!
+
+ &Open a connection file
+
+
+ &Try again
+
{0} has detected the Lenovo Auto Scroll Utility running on this system. This utility is known to cause problems with {0}. It is recommended that you disable or uninstall it.
@@ -911,7 +920,10 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for
{0} must be restarted before changes to the language will take effect.
- Load From SQL failed!
+ Load from SQL failed
+
+
+ The connection information could not be loaded from the SQL server.
Load From XML failed!