projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow prioritizing QUIT over other commands
[quassel.git]
/
src
/
core
/
corenetwork.cpp
diff --git
a/src/core/corenetwork.cpp
b/src/core/corenetwork.cpp
index
f622eea
..
d8cb2bf
100644
(file)
--- a/
src/core/corenetwork.cpp
+++ b/
src/core/corenetwork.cpp
@@
-222,7
+222,8
@@
void CoreNetwork::connectToIrc(bool reconnecting)
}
}
-void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason, bool withReconnect)
+void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason, bool withReconnect,
+ bool forceImmediate)
{
_quitRequested = requested; // see socketDisconnected();
if (!withReconnect) {
{
_quitRequested = requested; // see socketDisconnected();
if (!withReconnect) {
@@
-250,7
+251,7
@@
void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason, bool
socketDisconnected();
} else {
if (socket.state() == QAbstractSocket::ConnectedState) {
socketDisconnected();
} else {
if (socket.state() == QAbstractSocket::ConnectedState) {
- userInputHandler()->issueQuit(_quitReason);
+ userInputHandler()->issueQuit(_quitReason
, forceImmediate
);
} else {
socket.close();
}
} else {
socket.close();
}