mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Dont exec the app when loading as a secondary instance.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-22 03:35:02 +02:00
parent f91d9f30ce
commit 2c91365cbb
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/TomahawkApp.cpp
View File

@@ -121,6 +121,9 @@ using namespace Tomahawk;
TomahawkApp::TomahawkApp( int& argc, char *argv[] ) TomahawkApp::TomahawkApp( int& argc, char *argv[] )
: TOMAHAWK_APPLICATION( argc, argv ) : TOMAHAWK_APPLICATION( argc, argv )
#ifndef ENABLE_HEADLESS
, m_mainwindow( 0 )
#endif
, m_headless( false ) , m_headless( false )
, m_loaded( false ) , m_loaded( false )
{ {
@@ -188,7 +191,6 @@ TomahawkApp::init()
#ifdef ENABLE_HEADLESS #ifdef ENABLE_HEADLESS
m_headless = true; m_headless = true;
#else #else
m_mainwindow = 0;
m_headless = arguments().contains( "--headless" ); m_headless = arguments().contains( "--headless" );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) ); setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
setQuitOnLastWindowClosed( false ); setQuitOnLastWindowClosed( false );
@@ -360,7 +362,8 @@ TomahawkApp::~TomahawkApp()
if ( !m_connector.isNull() ) if ( !m_connector.isNull() )
delete m_connector.data(); delete m_connector.data();
Pipeline::instance()->stop(); if ( Pipeline::instance() )
Pipeline::instance()->stop();
if ( !m_servent.isNull() ) if ( !m_servent.isNull() )
delete m_servent.data(); delete m_servent.data();

5
src/main.cpp
View File

@@ -166,7 +166,10 @@ main( int argc, char *argv[] )
a.loadUrl( arg ); a.loadUrl( arg );
} }
int returnCode = a.exec(); int returnCode = 0;
if ( guard.isPrimaryInstance() )
returnCode = a.exec();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// clean up keyboard hook // clean up keyboard hook
if ( hKeyboardHook ) if ( hKeyboardHook )