3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-06-19 11:11:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve fix for issue 479

Browse source
This commit is contained in:
Nick Bolton 2010-06-01 21:29:38 +00:00
parent a2b79e062c
commit 70cfc74ce1
9 changed files with 69 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

56
lib/arch/CArchAppUtilWindows.cpp
View file

@ -26,7 +26,8 @@
#include <iostream>
#include <conio.h>
CArchAppUtilWindows::CArchAppUtilWindows()
CArchAppUtilWindows::CArchAppUtilWindows() :
m_exitMode(kExitModeNormal)
{
}
@ -67,13 +68,6 @@ CArchAppUtilWindows::parseArg(const int& argc, const char* const* argv, int& i)
return true;
}
void
CArchAppUtilWindows::adoptApp(CApp* app)
{
app->m_bye = &exitPause;
CArchAppUtil::adoptApp(app);
}
CString
CArchAppUtilWindows::getServiceArgs() const
{
@ -176,23 +170,6 @@ CArchAppUtilWindows::stopService()
LOG((CLOG_INFO "service '%s' stopping asyncronously", app().daemonName()));
}
void
exitPause(int code)
{
CString name;
CArchMiscWindows::getParentProcessName(name);
// if the user did not launch from the command prompt (i.e. it was launched
// by double clicking, or through a debugger), allow user to read any error
// messages (instead of the window closing automatically).
if (name != "cmd.exe") {
std::cout << std::endl << "Press any key to exit..." << std::endl;
int c = _getch();
}
throw XExitApp(code);
}
static
int
mainLoopStatic()
@ -210,9 +187,17 @@ CArchAppUtilWindows::daemonNTMainLoop(int argc, const char** argv)
}
void
CArchAppUtilWindows::byeThrow(int x)
CArchAppUtilWindows::exitApp(int code)
{
CArchMiscWindows::daemonFailed(x);
switch (m_exitMode) {
case kExitModeDaemon:
CArchMiscWindows::daemonFailed(code);
break;
default:
throw XExitApp(code);
}
}
int daemonNTMainLoopStatic(int argc, const char** argv)
@ -224,7 +209,7 @@ int
CArchAppUtilWindows::daemonNTStartup(int, char**)
{
CSystemLogger sysLogger(app().daemonName(), false);
app().m_bye = &byeThrow;
m_exitMode = kExitModeDaemon;
return ARCH->daemonize(app().daemonName(), daemonNTMainLoopStatic);
}
@ -242,6 +227,21 @@ foregroundStartupStatic(int argc, char** argv)
return CArchAppUtil::instance().app().foregroundStartup(argc, argv);
}
void
CArchAppUtilWindows::beforeAppExit()
{
CString name;
CArchMiscWindows::getParentProcessName(name);
// if the user did not launch from the command prompt (i.e. it was launched
// by double clicking, or through a debugger), allow user to read any error
// messages (instead of the window closing automatically).
if (name != "cmd.exe") {
std::cout << std::endl << "Press any key to exit..." << std::endl;
int c = _getch();
}
}
int
CArchAppUtilWindows::run(int argc, char** argv, CreateTaskBarReceiverFunc createTaskBarReceiver)
{