[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kinit
From:       Waldo Bastian <bastian () kde ! org>
Date:       2005-01-17 22:12:20
Message-ID: 20050117221220.0EBB01C35E () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Get rid of "Mutex destroy failure: Device or resource busy" by not deleting kapp
CCBUG: 83320


  M +7 -1      klauncher.cpp   1.102


--- kdelibs/kinit/klauncher.cpp  #1.101:1.102
@@ -221,4 +221,9 @@ KLauncher::KLauncher(int _kdeinitSocket)
 KLauncher::~KLauncher()
 {
+   close();
+}
+
+void KLauncher::close()
+{
    if (!mPoolSocketName.isEmpty())
    {
@@ -236,5 +241,6 @@ void
 KLauncher::destruct(int exit_code)
 {
-   delete kapp;
+   if (kapp) ((KLauncher*)kapp)->close();
+   // We don't delete kapp here, that's intentional.
    ::exit(exit_code);
 }


[prev in list] [next in list] [prev in thread] [next in thread]