fixed small memory leak and unnessary debug output

aardappel · Oct 16, 2014 · 2cca487 · 2cca487
1 parent e067eea
commit 2cca487
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/document.h b/src/document.h
@@ -215,7 +215,8 @@ struct Document
 
             sys->FileUsed(filename, this);
 
-            ::wxRemoveFile(sys->TmpName(filename));
+            if(::wxFileExists(sys->TmpName(filename)))
+                ::wxRemoveFile(sys->TmpName(filename));
         }
 
         UpdateFileName(page);
@@ -715,7 +716,7 @@ struct Document
     bool CloseDocument()
     {
         bool keep = CheckForChanges();
-        if(!keep && !filename.empty()) ::wxRemoveFile(sys->TmpName(filename));
+        if(!keep && !filename.empty() && ::wxFileExists(sys->TmpName(filename))) ::wxRemoveFile(sys->TmpName(filename));
         return keep;
     }
 

diff --git a/src/myframe.h b/src/myframe.h
@@ -601,6 +601,9 @@ struct MyFrame : wxFrame
         aui->UnInit();
         DELETEP(aui);
         DELETEP(editmenupopup);
+        #ifdef FSWATCH
+            DELETEP(watcher);
+        #endif
     }
     /*
     void OnSize(wxSizeEvent& event)
@@ -819,7 +822,7 @@ struct MyFrame : wxFrame
     void OnSizing(wxSizeEvent  &se) { se.Skip(); }
 
     void OnMaximize(wxMaximizeEvent &me) { ReFocus(); me.Skip(); }
-    void OnActivate(wxActivateEvent &ae) { ReFocus(); }    
+    void OnActivate(wxActivateEvent &ae) { /*ReFocus();*/ }    
 
     void OnIconize(wxIconizeEvent &me)
     {