Bug #1362, Bug #1361

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / bbtkwxGUIEditorGraphicBBS.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index d9a00b955053d7412eef47ef55078cc77b84f2e2..209007fc096074a549d862dc95c03921dcb5c862 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -462,16 +462,12 @@ void wxGUIEditorGraphicBBS::executeScript(std::string script) {
 
 //=========================================================================
 std::string wxGUIEditorGraphicBBS::CheckExtension(std::string filename, std::string extension) {
-        if(extension.size() != 4){
-                printf("CheckExtension Warning! Extension size != 4\n");
-        }else{
-                if(filename.size() > 4){
-                        if( (filename.compare(filename.size()-4,4,extension)) !=0 ){
-                                filename.append(extension);
-                        }
-                }else{
-                                filename.append(extension);
+        if(filename.size() > extension.size() ){
+                if( (filename.compare(filename.size()-extension.size(), extension.size(),extension)) !=0 ){
+                        filename.append(extension);
                 }
+        }else{
+                filename.append(extension);
         }
        return filename;
 }
@@ -771,9 +767,10 @@ void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
                wxString fileName = openFileDialog->GetPath();
                ifstream inputStream;
                std::string fName = (const char*) (fileName.mb_str());
+
                inputStream.open(fName.c_str());
+               assert(inputStream.good()); // fails
                _tabsMgr->addNewTab(openFileDialog->GetFilename());
-
                _tabsMgr->loadDiagram(inputStream, fName);
 
                inputStream.close();