X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/568b12fab06f1cde9d37f5ce633ffc505116761f..e6933ff9111c872f32f0bab7606251c53375679e:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 2111cfd22f..e2ff18c915 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1087,7 +1087,7 @@ void wxDocManager::OnMRUFile(wxCommandEvent& event)
     // Check if the id is in the range assigned to MRU list entries.
     const int id = event.GetId();
     if ( id >= wxID_FILE1 &&
-            id < wxID_FILE1 + m_fileHistory->GetBaseId() )
+            id < wxID_FILE1 + static_cast<int>(m_fileHistory->GetCount()) )
     {
         DoOpenMRUFile(id - wxID_FILE1);
     }
@@ -1408,6 +1408,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
             {
                 // file already open, just activate it and return
                 ActivateDocument(doc);
+                return doc;
             }
         }
     }