Don't segfault if an emergency doesn't have a block

[r2c2.git] / source / remote / remote.h

diff --git a/source/remote/remote.h b/source/remote/remote.h
index 0d6d413d2e2db93ff38a6874a1cbfba1c9f34797..875f25bbbdbf803d962bdece37ee1e568f148727 100644 (file)
--- a/source/remote/remote.h
+++ b/source/remote/remote.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef REMOTE_H_
 #define REMOTE_H_
 
@@ -14,9 +7,10 @@ Distributed under the GPL
 #include <msp/core/application.h>
 #include "network/client.h"
 
+class MainPanel;
 class TrainPanel;
 
-class Remote: public Msp::Application
+class Remote: public Msp::RegisteredApplication<Remote>
 {
 private:
        Msp::IO::EventDispatcher event_disp;
@@ -24,11 +18,10 @@ private:
        R2C2::Client client;
        Gtk::Main gtk;
        Gtk::Window window;
-       Gtk::Box *train_box;
+       Gtk::Box *panel_box;
+       MainPanel *main_panel;
        std::vector<TrainPanel *> train_panels;
 
-       static Msp::Application::RegApp<Remote> reg;
-
 public:
        Remote(int argc, char **argv);