From c9bb51b2623674a15dd33330447d1bd62afc0b56 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Mon, 11 May 2015 07:28:11 +0200
Subject: [PATCH] Some changes to rebooting mechanism.

---
 src/gui/messagesview.cpp                        | 6 +++---
 src/qtsingleapplication/qtlocalpeer.cpp         | 6 ++++++
 src/qtsingleapplication/qtlocalpeer.h           | 1 +
 src/qtsingleapplication/qtsingleapplication.cpp | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index efd470eae..836d314ae 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -148,11 +148,11 @@ void MessagesView::contextMenuEvent(QContextMenuEvent *event) {
     initializeContextMenu();
   }
 
-  if (sourceModel()->loadedSelection().mode() != FeedsSelection::MessagesFromRecycleBin) {
-    m_contextMenu->removeAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin);
+  if (sourceModel()->loadedSelection().mode() == FeedsSelection::MessagesFromRecycleBin) {
+    m_contextMenu->addAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin);
   }
   else {
-    m_contextMenu->addAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin);
+    m_contextMenu->removeAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin);
   }
 
   m_contextMenu->exec(event->globalPos());
diff --git a/src/qtsingleapplication/qtlocalpeer.cpp b/src/qtsingleapplication/qtlocalpeer.cpp
index a909cb22e..cc7d067e8 100644
--- a/src/qtsingleapplication/qtlocalpeer.cpp
+++ b/src/qtsingleapplication/qtlocalpeer.cpp
@@ -107,6 +107,12 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
     lockFile.open(QIODevice::ReadWrite);
 }
 
+QtLocalPeer::~QtLocalPeer() {
+  if (server != NULL) {
+    server->close();
+  }
+}
+
 
 
 bool QtLocalPeer::isClient()
diff --git a/src/qtsingleapplication/qtlocalpeer.h b/src/qtsingleapplication/qtlocalpeer.h
index 8a1f2d169..807a44ce4 100644
--- a/src/qtsingleapplication/qtlocalpeer.h
+++ b/src/qtsingleapplication/qtlocalpeer.h
@@ -53,6 +53,7 @@ class QtLocalPeer : public QObject
 
 public:
     QtLocalPeer(QObject *parent = 0, const QString &appId = QString());
+    ~QtLocalPeer();
     bool isClient();
     bool sendMessage(const QString &message, int timeout);
     QString applicationId() const
diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/qtsingleapplication/qtsingleapplication.cpp
index 66c70d1d8..0d171e0bd 100644
--- a/src/qtsingleapplication/qtsingleapplication.cpp
+++ b/src/qtsingleapplication/qtsingleapplication.cpp
@@ -330,7 +330,7 @@ void QtSingleApplication::activateWindow()
 }
 
 void QtSingleApplication::finish()
-{
+{ 
   delete peer; peer = 0;
 }