From de654660124e99be7fa1d3dd33a2235394f2b7bf Mon Sep 17 00:00:00 2001 From: Basil Huber Date: Wed, 18 Feb 2015 08:41:09 +0100 Subject: [PATCH] Cleaned up mess from merging --- src/QGCApplication.cc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 6029ce901..b923c1d6d 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -498,20 +498,11 @@ void QGCApplication::saveTempFlightDataLogOnMainThread(QString tempLogfile) if(QFile::exists(saveFilename) && !QFile::remove(saveFilename)){ // if the file cannot be removed, prompt user and ask new path saveError = true; -<<<<<<< Updated upstream - QMessageBox::warning (MainWindow::instance(), "File Error","Could not overwrite existing file.\nPlease provide a different file name to save to."); - QFile::copy(tempLogfile, saveFilename); - } else if(!QFile::copy(tempLogfile, saveFilename)) { - // if file could not be copied, prompt user and ask new path - saveError = true; - QMessageBox::warning (MainWindow::instance(), "File Error","Could not create file.\nPlease provide a different file name to save to."); -======= QGCApplication::criticalMessageBoxOnMainThread("File Error","Could not overwrite existing file.\nPlease provide a different file name to save to."); } else if(!QFile::copy(tempLogfile, saveFilename)) { // if file could not be copied, prompt user and ask new path saveError = true; QGCApplication::criticalMessageBoxOnMainThread("File Error","Could not create file.\nPlease provide a different file name to save to."); ->>>>>>> Stashed changes } } } while(saveError); // if the file could not be overwritten, ask for new file -- 2.22.0