From b3e6d76a1729ead40eb1fa5af98d8d734dfdd09b Mon Sep 17 00:00:00 2001
From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Thu, 13 Jul 2017 12:09:22 +0200
Subject: [PATCH] app: reset g_app on ~App()

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
---
 src/app.cpp | 4 ++++
 src/app.hpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/app.cpp b/src/app.cpp
index b261c53..29b28b5 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -22,6 +22,10 @@ App::App(wl::display *d) : api{this}, display{d}, controller{}, outputs() {
    g_app = this;
 }
 
+App::~App() {
+   g_app = nullptr;
+}
+
 int App::init() {
    if (!this->display->ok()) {
       return -1;
diff --git a/src/app.hpp b/src/app.hpp
index 4e1c4ff..172e688 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -32,6 +32,10 @@ struct App {
    std::vector<std::unique_ptr<struct wl::output>> outputs;
 
    App(wl::display *d);
+   ~App();
+
+   App(App const &) = delete;
+   App &operator=(App const &) = delete;
 
    int init();
    int dispatch_events();
-- 
2.16.6