ark: refresh 0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -6,26 +6,32 @@ MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
---
|
||||
app/main.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/app/main.cpp b/app/main.cpp
|
||||
index a9539b5..91f96ab 100644
|
||||
index 0396400..5924683 100644
|
||||
--- a/app/main.cpp
|
||||
+++ b/app/main.cpp
|
||||
@@ -178,6 +178,7 @@ int main(int argc, char **argv)
|
||||
@@ -206,6 +206,7 @@ int main(int argc, char **argv)
|
||||
// This is needed to prevent Dolphin from freezing when opening an archive.
|
||||
KDBusService dbusService(KDBusService::Multiple);
|
||||
KDBusService dbusService(KDBusService::Multiple | KDBusService::NoExitOnFailure);
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
// Session restoring.
|
||||
if (application.isSessionRestored()) {
|
||||
if (!KMainWindow::canBeRestored(1)) {
|
||||
@@ -190,8 +191,9 @@ int main(int argc, char **argv)
|
||||
@@ -218,8 +219,9 @@ int main(int argc, char **argv)
|
||||
delete window;
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user