X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcvs.cpp;h=c1565caf8ae8ec79503279d4bad94c366e523d1a;hb=ddfac3f719741977d49b3a84fcefe13e9e65b03a;hp=0ebb5257b9d60a26f4caba4dcb9b19312cb8a6e7;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/cvs.cpp b/synfig-studio/trunk/src/synfigapp/cvs.cpp index 0ebb525..c1565ca 100644 --- a/synfig-studio/trunk/src/synfigapp/cvs.cpp +++ b/synfig-studio/trunk/src/synfigapp/cvs.cpp @@ -203,11 +203,11 @@ CVSInfo::in_repository()const bool CVSInfo::is_modified()const { + if(!in_sandbox() || !in_repository()) + return false; #ifdef _DEBUG synfig::info("%d-%d=%d",get_current_timestamp(),get_original_timestamp(),get_current_timestamp()-get_original_timestamp()); #endif - if(!in_sandbox() || !in_repository()) - return false; return get_current_timestamp()!=get_original_timestamp() && abs(get_current_timestamp()-get_original_timestamp())!=3600; } @@ -238,7 +238,10 @@ CVSInfo::get_current_timestamp()const synfig::error("Unable to get file stats"); return false; } - return st.st_mtime+timezone+(daylight-1)*3600; + time_t ret((daylight-1)*3600); + //ret+=timezone; + ret+=st.st_mtime; + return ret; } synfig::String