Ticket #3334: importicons_windows_2.diff

libs/libmythtv/importicons.cpp

@@ -8 +8 @@
 #include "httpcomms.h"
 #include "importicons.h"
 #include "util.h"
+#include <qdir.h>
 
 ImportIconsWizard::ImportIconsWizard(bool fRefresh, QString channelname)
 {
@@ -29 +30 @@
 
 int ImportIconsWizard::exec()
 {
-    m_strChannelDir =  MythContext::GetConfDir()+ "/channels";
-    mkdir(MythContext::GetConfDir(),0776);
-    mkdir(m_strChannelDir,0776);
-    m_strChannelDir+="/";
+    QString dirpath = MythContext::GetConfDir();
+    QDir configDir(dirpath);
+    if (!configDir.exists())
+    {
+        if (!configDir.mkdir(dirpath, true))
+        {
+            VERBOSE(VB_IMPORTANT, QString("Could not create %1").arg(dirpath));
+        }
+    }
 
-        if (initialLoad(m_strChannelname) > 0)
+    m_strChannelDir = QString("%1/%2").arg(configDir.absPath()).arg("/channels");
+    QDir strChannelDir(m_strChannelDir);
+    if (!strChannelDir.exists())
+    {
+        if (!strChannelDir.mkdir(m_strChannelDir, true))
         {
-            startDialog();
-            m_missingIter=m_missingEntries.begin();
-            doLoad();
+            VERBOSE(VB_IMPORTANT, QString("Could not create %1").arg(m_strChannelDir));
         }
-        else
-            m_closeDialog=true;
+    }
+    m_strChannelDir+="/";
 
+    if (initialLoad(m_strChannelname) > 0)
+    {
+        startDialog();
+        m_missingIter=m_missingEntries.begin();
+        doLoad();
+    }
+    else
+        m_closeDialog=true;
+
     if (m_closeDialog==false) // Need this if line to exit if cancel button is pressed
         while ((ConfigurationDialog::exec() == QDialog::Accepted) && (m_closeDialog == false))  {}