From 7a3088d55329145dbbf948cc8eb5605de977fb9c Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Sat, 7 May 2016 16:47:47 -0400 Subject: [PATCH] Fixed a number of complier warnings --- mRemoteV1/App/Export.cs | 2 -- mRemoteV1/App/Runtime.cs | 5 +---- mRemoteV1/Config/KeyboardShortcuts/ShortcutKey.cs | 5 ++++- mRemoteV1/Container/ContainerInfo.cs | 3 --- mRemoteV1/Security/Security.Impersonator.cs | 3 --- mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs | 1 - 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/mRemoteV1/App/Export.cs b/mRemoteV1/App/Export.cs index b92d453b..867afd94 100644 --- a/mRemoteV1/App/Export.cs +++ b/mRemoteV1/App/Export.cs @@ -66,8 +66,6 @@ namespace mRemoteNG.App private static void SaveExportFile(string fileName, ConnectionsSaver.Format saveFormat, TreeNode rootNode, Security.Save saveSecurity) { - bool previousTimerEnabled = false; - try { if (Runtime.SQLConnProvider != null) diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs index 5d41fd0e..a90d6f13 100644 --- a/mRemoteV1/App/Runtime.cs +++ b/mRemoteV1/App/Runtime.cs @@ -47,7 +47,7 @@ namespace mRemoteNG.App private static SystemMenu _systemMenu; private static ILog _log; private static bool _isConnectionsFileLoaded; - private static System.Timers.Timer _timerSqlWatcher; + //private static System.Timers.Timer _timerSqlWatcher; private static SqlConnectionsProvider _sqlConnectionsProvider; private static DateTime _lastSqlUpdate; private static string _lastSelected; @@ -764,8 +764,6 @@ namespace mRemoteNG.App return; } - bool previousTimerState = false; - try { if (Update == true && My.Settings.Default.UseSQLServer == false) @@ -822,7 +820,6 @@ namespace mRemoteNG.App public static void SaveConnectionsAs() { - bool previousTimerState = false; ConnectionsSaver connectionsSave = new ConnectionsSaver(); try diff --git a/mRemoteV1/Config/KeyboardShortcuts/ShortcutKey.cs b/mRemoteV1/Config/KeyboardShortcuts/ShortcutKey.cs index 42df5a21..f50a558e 100644 --- a/mRemoteV1/Config/KeyboardShortcuts/ShortcutKey.cs +++ b/mRemoteV1/Config/KeyboardShortcuts/ShortcutKey.cs @@ -1,4 +1,6 @@ -using SharedLibraryNG; +using mRemoteNG.App; +using mRemoteNG.Messages; +using SharedLibraryNG; using System; using System.Collections.Generic; using System.ComponentModel; @@ -87,6 +89,7 @@ namespace mRemoteNG.Config.KeyboardShortcuts } catch (NullReferenceException e) { + Runtime.MessageCollector.AddExceptionMessage("Encountered Exception", e); return false; } return true; diff --git a/mRemoteV1/Container/ContainerInfo.cs b/mRemoteV1/Container/ContainerInfo.cs index 9868a1fb..dd60848c 100644 --- a/mRemoteV1/Container/ContainerInfo.cs +++ b/mRemoteV1/Container/ContainerInfo.cs @@ -92,10 +92,7 @@ namespace mRemoteNG.Container public void SetDefaults() { - if (this.IsExpanded == null) - { this.IsExpanded = true; - } } #endregion } diff --git a/mRemoteV1/Security/Security.Impersonator.cs b/mRemoteV1/Security/Security.Impersonator.cs index b09fc07a..cb3d48ec 100644 --- a/mRemoteV1/Security/Security.Impersonator.cs +++ b/mRemoteV1/Security/Security.Impersonator.cs @@ -6,9 +6,6 @@ using System.Security.Permissions; using mRemoteNG.App; -[assembly:SecurityPermissionAttribute(SecurityAction.RequestMinimum,UnmanagedCode=true)] -[assembly:PermissionSetAttribute(SecurityAction.RequestMinimum,Name="FullTrust")] - namespace mRemoteNG.Security { public class Impersonator diff --git a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs index dd3256b2..b6266905 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs @@ -124,7 +124,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.PerformLayout(); } - internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.Label lblLanguageRestartRequired; internal System.Windows.Forms.ComboBox cboLanguage; internal System.Windows.Forms.Label lblLanguage;