fix hung up

Author: katahiromz

src/MAddBitmapDlg.hpp

@@ -76,15 +76,15 @@ class MAddBitmapDlg : public MDialogBase
         HWND hwndEdit = info.hwndItem;
         m_pAutoComplete->bind(hwndEdit);
 
-        DoFile(hwnd, m_file);
-
         CenterWindowDx();
 
         if (m_file)
         {
+            DoFile(hwnd, m_file);
             SetFocus(hCmb2);
             return FALSE;
         }
+
         return TRUE;
     }
 

src/MAddCursorDlg.hpp

@@ -81,13 +81,13 @@ class MAddCursorDlg : public MDialogBase
 
         CenterWindowDx();
 
-        DoFile(hwnd, m_file);
-
         if (m_file)
         {
+            DoFile(hwnd, m_file);
             SetFocus(hCmb2);
             return FALSE;
         }
+
         return TRUE;
     }
 

src/MAddIconDlg.hpp

@@ -81,13 +81,13 @@ class MAddIconDlg : public MDialogBase
 
         CenterWindowDx();
 
-        DoFile(hwnd, m_file);
-
         if (m_file)
         {
+            DoFile(hwnd, m_file);
             SetFocus(hCmb2);
             return FALSE;
         }
+
         return TRUE;
     }
 

src/MAddResDlg.hpp

@@ -90,6 +90,7 @@ class MAddResDlg : public MDialogBase
         if (m_file)
         {
             SetDlgItemTextW(hwnd, edt1, m_file);
+            DoFile(hwnd, m_file);
         }
 
         // do centering the dialog
@@ -114,8 +115,6 @@ class MAddResDlg : public MDialogBase
         HWND hwndEdit = info.hwndItem;
         m_pAutoComplete->bind(hwndEdit);
 
-        DoFile(hwnd, m_file);
-
         return FALSE;
     }
 

src/MRadWindow.hpp

@@ -31,6 +31,7 @@
 #include "Res.hpp"
 #include "IconRes.hpp"
 #include <map>
+#include <memory>
 #include <unordered_set>     // for std::unordered_set
 #include <climits>
 #include "MOleHost.hpp"