Mercurial > mercurial > hgweb_searcher03.cgi
changeset 20:226774bf49fc
Small fix.
| author | pyon@macmini |
|---|---|
| date | Mon, 08 Dec 2014 19:47:42 +0900 |
| parents | 3bb803d8c1d7 |
| children | a2ad87cad48b |
| files | Changes include/update.h src/myframe.cpp src/update.cpp |
| diffstat | 4 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Changes Sun Dec 07 20:48:05 2014 +0900 +++ b/Changes Mon Dec 08 19:47:42 2014 +0900 @@ -1,3 +1,8 @@ +version 03.23 +2014-12-08 + Small fix. + +---- version 03.22 2014-12-03 Implement Mini-mode.
--- a/include/update.h Sun Dec 07 20:48:05 2014 +0900 +++ b/include/update.h Mon Dec 08 19:47:42 2014 +0900 @@ -1,12 +1,12 @@ // Filename : update.h -// Last Change: 19-Jun-2014. +// Last Change: 08-Dec-2014. #ifndef __UPDATE_H__ #define __UPDATE_H__ #include "common.h" -void CheckNewFiles( wxString shared ); +int CheckNewFiles( wxString shared ); void GetFile( wxString target, wxString newfile ); void PutFile( wxString newfile, wxString target );
--- a/src/myframe.cpp Sun Dec 07 20:48:05 2014 +0900 +++ b/src/myframe.cpp Mon Dec 08 19:47:42 2014 +0900 @@ -1,5 +1,5 @@ // Filename : myframe.cpp -// Last Change: 04-Dec-2014. +// Last Change: 08-Dec-2014. // #include "main.h" #include "db.h" @@ -354,7 +354,8 @@ this->Centre( wxBOTH ); LoadParam(); - CheckNewFiles( m_shared ); + if ( CheckNewFiles( m_shared ) != 0 ) + Close(); } MyFrame::~MyFrame()
--- a/src/update.cpp Sun Dec 07 20:48:05 2014 +0900 +++ b/src/update.cpp Mon Dec 08 19:47:42 2014 +0900 @@ -1,9 +1,9 @@ // Filename : update.cpp -// Last Change: 19-Jun-2014. +// Last Change: 08-Dec-2014. #include "update.h" -void CheckNewFiles( wxString shared ) +int CheckNewFiles( wxString shared ) { // index wxString cfile = wxGetCwd() + wxFILE_SEP_PATH + wxT("db") + wxFILE_SEP_PATH + wxT("ccn.db"); @@ -12,6 +12,10 @@ wxString nfile = shared + wxFILE_SEP_PATH + wxT("ccn.db"); fn.Assign( nfile ); + if ( !fn.IsFileReadable() ) { + wxMessageBox( wxT("共有ファイルにアクセスできなかったので終了します。") ); + return 1; + } wxDateTime nt = fn.GetModificationTime(); if ( nt - ct > wxTimeSpan::Week() ) { @@ -44,6 +48,8 @@ if ( ct - nt > wxTimeSpan::Day() ) PutFile( nfile, cfile ); } + + return 0; } void GetFile( wxString target, wxString newfile )