mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-05 21:57:41 +02:00
* Dont exec the app when loading as a secondary instance.
This commit is contained in:
@@ -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();
|
||||||
|
@@ -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 )
|
||||||
|
Reference in New Issue
Block a user