1 files changed, 15 insertions, 2 deletions

diff --git a/src/application.c b/src/application.c
index a56fd43..74641c5 100644
--- a/src/application.c
+++ b/src/application.c
@@ -34,10 +34,17 @@ application_init(MESSENGER_Application *app,
   app->argc = argc;
   app->argv = argv;
 
-  initscr();
+  app->window = initscr();
+
+  if (!(app->window))
+  {
+    app->status = GNUNET_SYSERR;
+    return;
+  }
+
   noecho();
 
-  keypad(stdscr, TRUE);
+  keypad(app->window, TRUE);
   timeout(100);
 }
 
@@ -49,6 +56,9 @@ run (void *cls,
 {
   MESSENGER_Application *app = cls;
 
+  if (!(app->window))
+    return;
+
   chat_start(&(app->chat), app, cfg);
 }
 
@@ -71,6 +81,9 @@ application_run(MESSENGER_Application *app)
 
   messages_clear(&(app->messages));
 
+  if (app->window)
+    delwin(app->window);
+
   endwin();
 }