Add App::isServerStarted function and replace

Signed-off-by: Nobuhiro Iwamatsu <[email protected]>
axs-gentoo · Feb 15, 2012 · 1bc48fa · 1bc48fa
1 parent 21bde07
commit 1bc48fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app.cpp b/app.cpp
@@ -112,7 +112,7 @@ int xioerror(Display *disp) {
 void CatchSignal(int sig) {
     cerr << APPNAME << ": unexpected signal " << sig << endl;
 
-    if (LoginApp->serverStarted)
+    if (LoginApp->isServerStarted())
         LoginApp->StopServer();
 
     LoginApp->RemoveLock();
@@ -1138,6 +1138,11 @@ void App::RemoveLock() {
     remove(cfg->getOption("lockfile").c_str());
 }
 
+// Get server start check flag.
+bool App::isServerStarted() {
+    return serverStarted;
+}
+
 // Redirect stdout and stderr to log file
 void App::OpenLog() {
     FILE *log = fopen (cfg->getOption("logfile").c_str(),"a");

diff --git a/app.h b/app.h
@@ -40,11 +40,12 @@ class App {
     void RestartServer();
     void StopServer();
 
-	bool serverStarted;
     // Lock functions
     void GetLock();
     void RemoveLock();
 
+    bool isServerStarted();
+
 private:
     void Login();
     void Reboot();
@@ -80,6 +81,7 @@ class App {
     Panel* LoginPanel;
     int ServerPID;
     const char* DisplayName;
+    bool serverStarted;
 
 #ifdef USE_PAM
 	PAM::Authenticator pam;