vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 626ebc8d81d684d3a845ff787fbaaf416df7e427
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Dec 4 14:42:31 2018 +0100
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Sat Dec 8 01:04:23 2018 +0100
tdf#121399 Join cmd reading thread in gtk3_kde5
Stop reading commands from the pipe on kde5 side once
the "Quit" command has been sent, in order to have
the thread that is reading commands from stdin finish
properly.
Join the thread in the 'FilePickerIpc' destructor, rather than
just deleting it while it may still be running, which
resulted in 'terminate()' being called.
Change-Id: Ia184987e7994cc1de0208ff2757a3cf06c8b7194
Reviewed-on: https://gerrit.libreoffice.org/63835
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit 93815c2b04f1905e43c695caf5cc2c594bb897ce)
Reviewed-on: https://gerrit.libreoffice.org/64588
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
index 803e5bedd853..4d7aff80c27c 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
@@ -192,6 +192,12 @@ void readCommands(FilePickerIpc* ipc)
readCommandArgs(command, args);
emit ipc->commandReceived(messageId, command, args);
+
+ // stop processing once 'Quit' command has been sent
+ if (command == Commands::Quit)
+ {
+ return;
+ }
}
}
@@ -211,7 +217,11 @@ FilePickerIpc::FilePickerIpc(KDE5FilePicker* filePicker,
QObject* parent)
m_ipcReaderThread = std::unique_ptr<std::thread>{ new
std::thread(readCommands, this) };
}
-FilePickerIpc::~FilePickerIpc() = default;
+FilePickerIpc::~FilePickerIpc()
+{
+ // join thread that reads commands
+ m_ipcReaderThread->join();
+};
bool FilePickerIpc::handleCommand(uint64_t messageId, Commands command,
QList<QVariant> args)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
