From 1bd7d37a0a39912739b64d700ca32196611b97f4 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 25 Mar 2012 09:58:09 -0400 Subject: [PATCH] eh --- admin/mac/macdeploy.py | 4 ++-- src/libtomahawk/resolvers/scriptresolver.cpp | 10 ++++++++-- src/main.cpp | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 31b4fb798..94eed534b 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -1,6 +1,6 @@ #!/usr/bin/python - -# This file is part of Clementine. +# This file is part of Tomahawk. +# It was inspired in large part by the macdeploy script in Clementine. # # Clementine is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/libtomahawk/resolvers/scriptresolver.cpp b/src/libtomahawk/resolvers/scriptresolver.cpp index 8392346bd..a8b97623e 100644 --- a/src/libtomahawk/resolvers/scriptresolver.cpp +++ b/src/libtomahawk/resolvers/scriptresolver.cpp @@ -63,8 +63,14 @@ ScriptResolver::~ScriptResolver() { disconnect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), this, SLOT( cmdExited( int, QProcess::ExitStatus ) ) ); - m_proc.kill(); - m_proc.waitForFinished(); + QVariantMap msg; + msg[ "_msgtype" ] = "quit"; + sendMessage( msg ); + + // QEventLoop::processEvents(QEventLoop::ExcludeUserInputEvents); + + // m_proc.terminate(); + m_proc.waitForFinished( 1000 ); Tomahawk::Pipeline::instance()->removeResolver( this ); diff --git a/src/main.cpp b/src/main.cpp index f25a34a58..4ad4ca4d4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -124,7 +124,7 @@ main( int argc, char *argv[] ) #endif #ifndef ENABLE_HEADLESS - new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() ); + // new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() ); #endif KDSingleApplicationGuard guard( &a, KDSingleApplicationGuard::AutoKillOtherInstances );