mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 05:37:29 +02:00
Code Issues Releases Wiki Activity

eh

Browse Source
This commit is contained in:
Leo Franchi
2012-03-25 09:58:09 -04:00
parent 4dabbdf247
commit 1bd7d37a0a
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/mac/macdeploy.py
View File

@@ -1,6 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
# This file is part of Tomahawk.
# This file is part of Clementine. # It was inspired in large part by the macdeploy script in Clementine.
# #
# Clementine is free software: you can redistribute it and/or modify # Clementine is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by

10
src/libtomahawk/resolvers/scriptresolver.cpp
View File

@@ -63,8 +63,14 @@ ScriptResolver::~ScriptResolver()
{ {
disconnect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), this, SLOT( cmdExited( int, QProcess::ExitStatus ) ) ); disconnect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), this, SLOT( cmdExited( int, QProcess::ExitStatus ) ) );
m_proc.kill(); QVariantMap msg;
m_proc.waitForFinished(); msg[ "_msgtype" ] = "quit";
sendMessage( msg );
// QEventLoop::processEvents(QEventLoop::ExcludeUserInputEvents);
// m_proc.terminate();
m_proc.waitForFinished( 1000 );
Tomahawk::Pipeline::instance()->removeResolver( this ); Tomahawk::Pipeline::instance()->removeResolver( this );

2
src/main.cpp
View File

@@ -124,7 +124,7 @@ main( int argc, char *argv[] )
#endif #endif
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() ); // new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() );
#endif #endif
KDSingleApplicationGuard guard( &a, KDSingleApplicationGuard::AutoKillOtherInstances ); KDSingleApplicationGuard guard( &a, KDSingleApplicationGuard::AutoKillOtherInstances );