From 5fbdd8856d02ed238e8f0b61315c6c9a1b680172 Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 5 May 2004 13:54:46 +0000 Subject: [PATCH] Patch level :2.1 26 Files correlati :ba0.exe, ba0close.exe Ricompilazione Demo : [ ] Commento : Finalmente risolto (?) il problema relativo alla ri-nomina dei files .ex_ e .dl_ in chiusura di ba0.exe. git-svn-id: svn://10.65.10.50/trunk@12053 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba0100.cpp | 11 +++++++++-- ba/ba0101.cpp | 3 ++- ba/ba0close.cpp | 6 ++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp index f0bee418a..3f6e90ee3 100755 --- a/ba/ba0100.cpp +++ b/ba/ba0100.cpp @@ -1097,8 +1097,15 @@ bool TMenu_application::destroy() if (sys_dll_changed()) { - TExternal_app ba0close("ba0close.exe"); - ba0close.run(TRUE,TRUE,TRUE); // run asynchronous... +// static bool launched = false; +// if (!launched) + { +// launched = true; + TExternal_app ba0close("ba0close.exe"); + ba0close.run(TRUE,TRUE,TRUE); // run asynchronous... + } +// else +// error_box("Doppia chiusura"); } return TRUE; } diff --git a/ba/ba0101.cpp b/ba/ba0101.cpp index 23cd778e7..bc52189c3 100755 --- a/ba/ba0101.cpp +++ b/ba/ba0101.cpp @@ -318,7 +318,8 @@ bool TMenuitem::perform_program() const const bool install_app = _action.starts_with("ba1 -6", TRUE); if (install_app && sys_dll_changed()) - main_app().stop_run(); + dispatch_e_char(cur_win(), K_QUIT); + //main_app().stop_run(); } return ok; diff --git a/ba/ba0close.cpp b/ba/ba0close.cpp index 543c6f87e..f3f3123e1 100755 --- a/ba/ba0close.cpp +++ b/ba/ba0close.cpp @@ -39,7 +39,7 @@ void Renamer(const char* mask) sprintf(msg, "Impossibile ridenominare il file %s in %s:\n%s", oldpath, newpath, lpMsgBuf); ::LocalFree(lpMsgBuf); - ::MessageBox(NULL, msg, "Ba0Close Error", MB_ICONERROR | MB_OK); + ::MessageBox(NULL, msg, "Aggiornamento sistema", MB_ICONERROR | MB_OK); } } @@ -49,7 +49,9 @@ void Renamer(const char* mask) int PASCAL WinMain(HINSTANCE, HINSTANCE , LPSTR, int) { - ::Sleep(5000); // Apetta qualche secondo che termini ba0.exe + ::MessageBox(NULL, "Premere OK prima di riavviare il programma", + "Aggiornamento sistema", MB_ICONWARNING | MB_OK); +// ::Sleep(5000); // Apetta qualche secondo che termini ba0.exe Renamer("*.??_"); Renamer("Servers\\*.??_");