[Amis-vcs] SF.net SVN: amis: [2181] branches/amis3
Brought to you by:
julienq,
marisademeglio
From: <mar...@us...> - 2007-09-27 14:37:09
|
Revision: 2181 http://amis.svn.sourceforge.net/amis/?rev=2181&view=rev Author: marisademeglio Date: 2007-09-27 07:37:13 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Trying to fix little stupid bugs related to closing books or opening several in a row Modified Paths: -------------- branches/amis3/AmisCore/src/dtb/Dtb.cpp branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp Modified: branches/amis3/AmisCore/src/dtb/Dtb.cpp =================================================================== --- branches/amis3/AmisCore/src/dtb/Dtb.cpp 2007-09-27 14:21:28 UTC (rev 2180) +++ branches/amis3/AmisCore/src/dtb/Dtb.cpp 2007-09-27 14:37:13 UTC (rev 2181) @@ -133,6 +133,7 @@ //cout<<"trying to open: "<<filepath<<endl; + mpFiles = NULL; mpFiles = new amis::dtb::DtbFileSet(); mpFiles->initWithNccOrOpf(fileUrl); mpFiles->setBookmarksDirectory(bookmarksDirectory); Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-09-27 14:21:28 UTC (rev 2180) +++ branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-09-27 14:37:13 UTC (rev 2181) @@ -297,6 +297,8 @@ { amis::gui::dialogs::AmisFileDialog* p_dlg = new amis::gui::dialogs::AmisFileDialog(amis::gui::dialogs::AmisFileDialog::getFileOpenFilter()); string filename = p_dlg->showOpen(); + if (filename == "") return; + //the user is able to open UAK files through AMIS if (isUserKeyFile(filename)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |