author | sandman <sandman> | 2002-07-28 00:44:43 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-28 00:44:43 (UTC) |
commit | 72081cbfef03a69ed6f9ca7826854b6cf10dc2fe (patch) (unidiff) | |
tree | 43e67bdc7cbb972f431b3912e2f068df3d2c97bf /core/launcher/desktop.cpp | |
parent | 4baf36396739502c5471950e29f18954cca4517b (diff) | |
download | opie-72081cbfef03a69ed6f9ca7826854b6cf10dc2fe.zip opie-72081cbfef03a69ed6f9ca7826854b6cf10dc2fe.tar.gz opie-72081cbfef03a69ed6f9ca7826854b6cf10dc2fe.tar.bz2 |
Workaround for a weird Qt/E bug, resulting in qpe hanging if clipboard
applet is loaded and qpe is terminated via shutdown applet.
-rw-r--r-- | core/launcher/desktop.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index e58b08c..f90da1a 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -683,12 +683,18 @@ void DesktopApplication::shutdown( ShutdownImpl::Type t ) | |||
683 | break; | 683 | break; |
684 | case ShutdownImpl::RestartDesktop: | 684 | case ShutdownImpl::RestartDesktop: |
685 | restart(); | 685 | restart(); |
686 | break; | 686 | break; |
687 | case ShutdownImpl::TerminateDesktop: | 687 | case ShutdownImpl::TerminateDesktop: |
688 | prepareForTermination(FALSE); | 688 | prepareForTermination(FALSE); |
689 | |||
690 | // This is a workaround for a Qt bug | ||
691 | // clipboard applet has to stop its poll timer, or Qt/E | ||
692 | // will hang on quit() right before it emits aboutToQuit() | ||
693 | emit aboutToQuit ( ); | ||
694 | |||
689 | quit(); | 695 | quit(); |
690 | break; | 696 | break; |
691 | } | 697 | } |
692 | } | 698 | } |
693 | 699 | ||
694 | void DesktopApplication::restart() | 700 | void DesktopApplication::restart() |