pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some changes to rebooting mechanism.

Browse source
This commit is contained in:
Martin Rotter 2015-05-11 07:28:11 +02:00
parent 332b488cc4
commit c9bb51b262
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/messagesview.cpp
View file

@ -148,11 +148,11 @@ void MessagesView::contextMenuEvent(QContextMenuEvent *event) {
initializeContextMenu(); initializeContextMenu();
} }
if (sourceModel()->loadedSelection().mode() != FeedsSelection::MessagesFromRecycleBin) { if (sourceModel()->loadedSelection().mode() == FeedsSelection::MessagesFromRecycleBin) {
m_contextMenu->removeAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin); m_contextMenu->addAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin);
} }
else { else {
m_contextMenu->addAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin); m_contextMenu->removeAction(qApp->mainForm()->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin);
} }
m_contextMenu->exec(event->globalPos()); m_contextMenu->exec(event->globalPos());

6
src/qtsingleapplication/qtlocalpeer.cpp
View file

@ -107,6 +107,12 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
lockFile.open(QIODevice::ReadWrite); lockFile.open(QIODevice::ReadWrite);
} }
QtLocalPeer::~QtLocalPeer() {
if (server != NULL) {
server->close();
}
}
bool QtLocalPeer::isClient() bool QtLocalPeer::isClient()

1
src/qtsingleapplication/qtlocalpeer.h
View file

@ -53,6 +53,7 @@ class QtLocalPeer : public QObject
public: public:
QtLocalPeer(QObject *parent = 0, const QString &appId = QString()); QtLocalPeer(QObject *parent = 0, const QString &appId = QString());
~QtLocalPeer();
bool isClient(); bool isClient();
bool sendMessage(const QString &message, int timeout); bool sendMessage(const QString &message, int timeout);
QString applicationId() const QString applicationId() const

2
src/qtsingleapplication/qtsingleapplication.cpp
View file

@ -330,7 +330,7 @@ void QtSingleApplication::activateWindow()
} }
void QtSingleApplication::finish() void QtSingleApplication::finish()
{ {
delete peer; peer = 0; delete peer; peer = 0;
} }