reapack

commit a039c49b3a549d1d0fe3ce50f8916a5ab81d415e
parent d3a0b906825bf233e98dce8a1ec227d38079f942
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Tue,  6 Jun 2017 16:31:20 -0400

import: better implementation of 94e68100adc0f8bfe0b47194193e017dfbcf7cae

Diffstat:
M
src/import.cpp
 | 
10
++++------

1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/import.cpp b/src/import.cpp
@@ -94,9 +94,6 @@ ThreadPool *Import::setupPool()
     m_pool->onDone([=] {
       setWaiting(false);
 
-      if(m_queue.empty())
-        m_state = Close;
-
       if(!m_state)
         processQueue();
 
@@ -143,7 +140,7 @@ void Import::fetch()
       case ThreadTask::Failure: {
         auto_char msg[1024];
         auto_snprintf(msg, auto_size(msg),
-          AUTO_STR("Download failed: %s\r\n\r\nURL: %s"),
+          AUTO_STR("Download failed: %s\r\nn%s"),
           make_autostring(dl->error().message).c_str(), make_autostring(url).c_str());
         MessageBox(handle(), msg, TITLE, MB_OK);
         m_pool->abort();
@@ -213,7 +210,7 @@ bool Import::read(MemoryDownload *dl)
 
 void Import::processQueue()
 {
-  bool ok = true;
+  bool ok = true, commit = !m_queue.empty();
 
   while(!m_queue.empty()) {
     if(!import(m_queue.front()))
@@ -225,7 +222,8 @@ void Import::processQueue()
   if(ok)
     m_state = Close;
 
-  m_reapack->commitConfig();
+  if(commit)
+    m_reapack->commitConfig();
 }
 
 bool Import::import(const ImportData &data)