From cd7806be597141f74f07b7c1686dcc052c1db169 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 22 Dec 2015 07:33:33 +1000
Subject: [PATCH] A couple of import hang fixes, (FPIcon wrong path selected,
 and double import)

---
 .../SleepLib/loader_plugins/icon_loader.cpp       | 15 ++++++++++++++-
 sleepyhead/mainwindow.cpp                         | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
index 98d15f88..b6b8dee1 100644
--- a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
@@ -40,11 +40,24 @@ FPIconLoader::~FPIconLoader()
 
 bool FPIconLoader::Detect(const QString & givenpath)
 {
-    QDir dir(givenpath);
+    QString path = givenpath;
+    
+    path = path.replace("\\", "/");
+
+    if (path.endsWith("/")) {
+        path.chop(1);
+    }
+
+    if (path.endsWith("/" + FPHCARE)) {
+        path = path.section("/",0,-2);
+    }
+    
+    QDir dir(path);
 
     if (!dir.exists()) {
         return false;
     }
+    
 
     // F&P Icon have a folder called FPHCARE in the root directory
     if (!dir.exists(FPHCARE)) {
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 3790cf7f..5d958f22 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -920,10 +920,16 @@ QList<ImportPath> MainWindow::detectCPAPCards()
 
 void MainWindow::on_action_Import_Data_triggered()
 {
+    static bool in_import = false;
     if (m_inRecalculation) {
         Notify(tr("Access to Import has been blocked while recalculations are in progress."),STR_MessageBox_Busy);
         return;
     }
+    if (in_import) {
+        Notify(tr("Import is already running in the background."),STR_MessageBox_Busy);
+        return;
+    }
+    in_import=true;
 
     QList<ImportPath> datacards = detectCPAPCards();
 
@@ -971,6 +977,7 @@ void MainWindow::on_action_Import_Data_triggered()
             if (res == QMessageBox::Cancel) {
                 // Give the communal progress bar back
                 ui->statusbar->insertWidget(1,qprogress,1);
+                in_import=false;
                 return;
             } else if (res == QMessageBox::No) {
                 waitmsg->setText(tr("Please wait, launching file dialog..."));
@@ -1039,6 +1046,7 @@ void MainWindow::on_action_Import_Data_triggered()
         if (w.exec() != QDialog::Accepted) {
             popup.hide();
             ui->statusbar->insertWidget(1,qprogress,1);
+            in_import=false;
 
             return;
         }
@@ -1099,6 +1107,8 @@ void MainWindow::on_action_Import_Data_triggered()
         finishCPAPImport();
         PopulatePurgeMenu();
     }
+    in_import=false;
+
 }
 
 QMenu *MainWindow::CreateMenu(QString title)