Fix 'Escape' key not clearing notification tweet queue & refactor HideNotification

Core/Handling/KeyboardHandlerNotification.cs

@@ -19,7 +19,7 @@ bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser
                         return true;
 
                     case Keys.Escape:
-                        notification.InvokeAsyncSafe(() => notification.HideNotification(true));
+                        notification.InvokeAsyncSafe(notification.HideNotification);
                         return true;
 
                     case Keys.Space:

Core/Notification/FormNotificationBase.cs

@@ -167,11 +167,8 @@ private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitial
 
         // notification methods
 
-        public virtual void HideNotification(bool loadBlank){
+        public virtual void HideNotification(){
-            if (loadBlank){
+            browser.Load("about:blank");
-                browser.Load("about:blank");
-            }
-
             Location = ControlExtensions.InvisibleLocation;
             currentNotification = null;
         }

Core/Notification/FormNotificationMain.cs

@@ -148,7 +148,7 @@ private IntPtr MouseHookProc(int nCode, IntPtr wParam, IntPtr lParam){
 
         private void FormNotification_FormClosing(object sender, FormClosingEventArgs e){
             if (e.CloseReason == CloseReason.UserClosing){
-                HideNotification(true);
+                HideNotification();
                 e.Cancel = true;
             }
         }
@@ -205,8 +205,8 @@ public void ShowNotificationForSettings(bool reset){
             UpdateTitle();
         }
 
-        public override void HideNotification(bool loadBlank){
+        public override void HideNotification(){
-            base.HideNotification(loadBlank);
+            base.HideNotification();
             
             progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? 1000 : 0;
             timerProgress.Stop();

Core/Notification/FormNotificationTweet.Designer.cs

@@ -40,7 +40,6 @@ private void InitializeComponent() {
             // 
             // FormNotificationTweet
             // 
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormNotificationTweet_FormClosing);
             this.ResumeLayout(true);
 
         }

Core/Notification/FormNotificationTweet.cs

@@ -26,20 +26,6 @@ public FormNotificationTweet(FormBrowser owner, PluginManager pluginManager) : b
             }
         }
 
-        private void FormNotificationTweet_FormClosing(object sender, FormClosingEventArgs e){
-            if (e.CloseReason == CloseReason.UserClosing){
-                tweetQueue.Clear(); // already canceled
-                TrimQueue();
-            }
-        }
-
-        private void TrimQueue(){
-            if (needsTrim){
-                tweetQueue.TrimExcess();
-                needsTrim = false;
-            }
-        }
-
         // event handlers
 
         private void Config_MuteToggled(object sender, EventArgs e){
@@ -68,11 +54,9 @@ private void timerIdlePauseCheck_Tick(object sender, EventArgs e){
         // notification methods
 
         public override void ShowNotification(TweetNotification notification){
-            if (IsPaused){
+            tweetQueue.Enqueue(notification);
-                tweetQueue.Enqueue(notification);
+            
-            }
+            if (!IsPaused){
-            else{
-                tweetQueue.Enqueue(notification);
                 UpdateTitle();
 
                 if (totalTime == 0){
@@ -83,13 +67,22 @@ public override void ShowNotification(TweetNotification notification){
             needsTrim |= tweetQueue.Count >= TrimMinimum;
         }
 
+        public override void HideNotification(){
+            base.HideNotification();
+            tweetQueue.Clear();
+
+            if (needsTrim){
+                tweetQueue.TrimExcess();
+                needsTrim = false;
+            }
+        }
+
         public override void FinishCurrentNotification(){
             if (tweetQueue.Count > 0){
                 LoadNextNotification();
             }
             else{
-                HideNotification(true);
+                HideNotification();
-                TrimQueue();
             }
         }
 

Core/Other/Settings/TabSettingsNotifications.cs

@@ -110,7 +110,7 @@ public override void OnReady(){
 
         private void TabSettingsNotifications_ParentChanged(object sender, EventArgs e){
             if (Parent == null){
-                notification.HideNotification(false);
+                notification.HideNotification();
             }
             else{
                 notification.ShowNotificationForSettings(true);