QuasarApp/installer-framework
4
0
Fork 0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-10 11:59:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix possible crash. Disable close button during installer run.

Browse Source 
Change-Id: I6a0affab7394e3ae9669904bbfc48617b5cb1bd5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Tim Jenssen 2013-09-27 12:45:58 +02:00 committed by Karsten Heimrich
parent 7a5aa97c9b
commit 047844cddf
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
installerfw.pri
View File

@ -56,6 +56,9 @@ unix:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/unix/CPP
LIBS += -L$$IFW_LIB_PATH LIBS += -L$$IFW_LIB_PATH
# The order is important. The linker needs to parse archives in reversed dependency order. # The order is important. The linker needs to parse archives in reversed dependency order.
equals(TEMPLATE, app):LIBS += -linstaller equals(TEMPLATE, app):LIBS += -linstaller
win32:equals(TEMPLATE, app) {
LIBS += -luser32
}
unix:!macx:LIBS += -lutil unix:!macx:LIBS += -lutil
macx:LIBS += -framework Carbon -framework Security macx:LIBS += -framework Carbon -framework Security

5
src/sdk/installerbase_p.cpp
View File

@ -135,6 +135,11 @@ public:
m_oldCerr = std::cerr.rdbuf(); m_oldCerr = std::cerr.rdbuf();
m_newCerr.open("CONOUT$"); m_newCerr.open("CONOUT$");
std::cerr.rdbuf(m_newCerr.rdbuf()); std::cerr.rdbuf(m_newCerr.rdbuf());
HMENU systemMenu = GetSystemMenu(GetConsoleWindow(), FALSE);
if (systemMenu != NULL)
RemoveMenu(systemMenu, SC_CLOSE, MF_BYCOMMAND);
DrawMenuBar(GetConsoleWindow());
#endif #endif
} }
~MyApplicationConsole() ~MyApplicationConsole()