Changeset 590

Show
Ignore:
Timestamp:
10/22/08 15:24:34 (3 months ago)
Author:
wolke
Message:

fix: audio file browser on cancel button pressed know will return the loadlayer function without load nothing into the selected layer.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gui/src/AudioFileBrowser/AudioFileBrowser.cpp

    r589 r590  
    3434#include <hydrogen/audio_engine.h> 
    3535 
    36 #include <QApplication> 
     36//#include <QApplication> 
    3737#include <QModelIndex> 
    3838#include <QTreeWidget> 
    …… 
    158158        pathLineEdit->setText( onlypath ); 
    159159 
     160        QApplication::setOverrideCursor(Qt::WaitCursor); 
    160161         
    161162 
    …… 
    172173                ) { 
    173174 
    174                         QApplication::setOverrideCursor(Qt::WaitCursor); 
     175 
    175176                        Sample *pNewSample = Sample::load( path2 ); 
    176                         QApplication::restoreOverrideCursor(); 
     177 
    177178                        if ( pNewSample ) { 
    178179                                m_pNBytesLable->setText( trUtf8( "Size: %1 bytes" ).arg( pNewSample->get_size() / 2 ) ); 
    …… 
    214215                        m_psamplefilename = ""; 
    215216                } 
     217        QApplication::restoreOverrideCursor(); 
    216218} 
    217219 

  • trunk/gui/src/InstrumentEditor/InstrumentEditor.cpp

    r586 r590  
    497497        } 
    498498 
    499          
    500  
    501499        delete fb; 
     500 
     501        if ( filename[2] == "") return; 
    502502 
    503503        bool fnc = false;