Merge pull request #2106 from Wallacoloo/remove-hasGUI

Replace 'Engine::hasGUI()' with 'gui != nullptr'
This commit is contained in:
Lukas W
2015-06-16 14:26:08 +02:00
9 changed files with 25 additions and 33 deletions

View File

@@ -97,7 +97,7 @@ bool MidiImport::tryImport( TrackContainer* tc )
}
#ifdef LMMS_HAVE_FLUIDSYNTH
if( Engine::hasGUI() &&
if( gui != NULL &&
ConfigManager::inst()->defaultSoundfont().isEmpty() )
{
QMessageBox::information( gui->mainWindow(),
@@ -110,7 +110,7 @@ bool MidiImport::tryImport( TrackContainer* tc )
"settings dialog and try again." ) );
}
#else
if( Engine::hasGUI() )
if( gui )
{
QMessageBox::information( gui->mainWindow(),
tr( "Setup incomplete" ),

View File

@@ -34,6 +34,7 @@
#include "Engine.h"
#include "gui_templates.h"
#include "GuiApplication.h"
#include "InstrumentTrack.h"
#include "embed.cpp"
@@ -327,7 +328,7 @@ malletsInstrumentView::malletsInstrumentView( malletsInstrument * _instrument,
m_spreadKnob->setHintText( tr( "Spread:" ), "" );
// try to inform user about missing Stk-installation
if( _instrument->m_filesMissing && Engine::hasGUI() )
if( _instrument->m_filesMissing && gui != NULL )
{
QMessageBox::information( 0, tr( "Missing files" ),
tr( "Your Stk-installation seems to be "