[Amis-vcs] SF.net SVN: amis: [2452] branches/amis3
Brought to you by:
julienq,
marisademeglio
From: <mar...@us...> - 2008-03-28 23:06:57
|
Revision: 2452 http://amis.svn.sourceforge.net/amis/?rev=2452&view=rev Author: marisademeglio Date: 2008-03-28 16:07:03 -0700 (Fri, 28 Mar 2008) Log Message: ----------- Made a few adjustments to work with VC8 Fixed crash-once-but-never-again bug Modified Paths: -------------- branches/amis3/AmisCore/AmisCore.vcproj branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp branches/amis3/AmisGuiMFC2/src/pdtb.cpp Added Paths: ----------- branches/amis3/VC8/ Removed Paths: ------------- branches/amis3/VC7/ Modified: branches/amis3/AmisCore/AmisCore.vcproj =================================================================== --- branches/amis3/AmisCore/AmisCore.vcproj 2008-03-27 17:41:50 UTC (rev 2451) +++ branches/amis3/AmisCore/AmisCore.vcproj 2008-03-28 23:07:03 UTC (rev 2452) @@ -21,6 +21,7 @@ IntermediateDirectory="Debug" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="2" CharacterSet="1" > <Tool @@ -89,6 +90,7 @@ IntermediateDirectory="Release" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="2" CharacterSet="1" > <Tool Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-27 17:41:50 UTC (rev 2451) +++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-28 23:07:03 UTC (rev 2452) @@ -247,8 +247,10 @@ if (b_open_from_cmdline == false && Preferences::Instance()->getLoadLastBook() == true && mbWasLastExitClean == true) - book_to_open = mpHistory->getLastRead()->mPath; - + { + if (mpHistory->getLastRead() != NULL) + book_to_open = mpHistory->getLastRead()->mPath; + } //open a book if we decided to either open the command line parameter or last-read book if (!book_to_open.is_empty_path()) openBook(&book_to_open); Modified: branches/amis3/AmisGuiMFC2/src/pdtb.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/pdtb.cpp 2008-03-27 17:41:50 UTC (rev 2451) +++ branches/amis3/AmisGuiMFC2/src/pdtb.cpp 2008-03-28 23:07:03 UTC (rev 2452) @@ -1,6 +1,6 @@ #include "pdtb.h" #include "stdafx.h" -//for string transformations +//for string transformations #include <algorithm> #include "util/Log.h" @@ -89,8 +89,8 @@ bool isUserKeyFile(string filename) { - string file_ext = amis::util::FilePathTools::getExtension(filename); - //convert the string to lower case before doing a comparison + string file_ext = amis::util::FilePathTools::getExtension(filename); + //convert the string to lower case before doing a comparison std::transform(file_ext.begin(), file_ext.end(), file_ext.begin(), (int(*)(int))tolower); if (file_ext == "uak") return true; else return false; Copied: branches/amis3/VC8 (from rev 2450, branches/amis3/VC7) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |