From bc699a04ec95390c701cedd476a73fd52390d076 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Fri, 27 Sep 2013 22:15:40 -0500 Subject: [PATCH] Fix issue MR-525 - Could not start on windows 7 64bit --- CHANGELOG.TXT | 3 ++- mRemoteV1/Config/Config.Settings.Load.vb | 6 +++++- mRemoteV1/Themes/ThemeManager.vb | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index da53c7352..a4f636eda 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,7 +1,8 @@ 1.71: + Fixed issue MR-495 - Having a negative range in port scan creates memory exhaustion. Fixed issue MR-514 - Window Proxy test failed without close button Fixed issue MR-521 - Right-Clicking in "Sessions" panel crashes mRemoteNG - Fixed issue MR-495 - Having a negative range in port scan creates memory exhaustion. + Fixed issue MR-525 - Could not start on windows 7 64bit Made minor improvements to the port scan functionality. 1.71 Beta 5 (2013-06-09): diff --git a/mRemoteV1/Config/Config.Settings.Load.vb b/mRemoteV1/Config/Config.Settings.Load.vb index 8ed5713d2..903d870f6 100644 --- a/mRemoteV1/Config/Config.Settings.Load.vb +++ b/mRemoteV1/Config/Config.Settings.Load.vb @@ -29,7 +29,11 @@ Namespace Config With Me._MainForm ' Migrate settings from previous version If My.Settings.DoUpgrade Then - My.Settings.Upgrade() + Try + My.Settings.Upgrade() + Catch ex As Exception + Log.Error("My.Settings.Upgrade() failed" & vbNewLine & ex.Message) + End Try My.Settings.DoUpgrade = False ' Clear pending update flag diff --git a/mRemoteV1/Themes/ThemeManager.vb b/mRemoteV1/Themes/ThemeManager.vb index c178b4cdf..9b49f02c3 100644 --- a/mRemoteV1/Themes/ThemeManager.vb +++ b/mRemoteV1/Themes/ThemeManager.vb @@ -70,6 +70,7 @@ Namespace Themes Private Shared _activeThemeHandlerSet As Boolean = False Public Shared Property ActiveTheme As ThemeInfo Get + If _activeTheme Is Nothing Then Return DefaultTheme Return _activeTheme End Get Set(value As ThemeInfo)