From ebec853a5425dc3a5fcb9b6e139ca37f70acd2db Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 24 Nov 2016 16:19:19 -0300 Subject: [PATCH] Define devconsole only when ENABLE_SCRIPTING is on --- src/app/ui/main_window.cpp | 7 ++++++- src/app/ui/main_window.h | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/ui/main_window.cpp b/src/app/ui/main_window.cpp index ea0242666..27d9e79a5 100644 --- a/src/app/ui/main_window.cpp +++ b/src/app/ui/main_window.cpp @@ -90,8 +90,10 @@ public: MainWindow::MainWindow() : m_mode(NormalMode) , m_homeView(nullptr) - , m_devConsoleView(nullptr) , m_scalePanic(nullptr) +#ifdef ENABLE_SCRIPTING + , m_devConsoleView(nullptr) +#endif { // Load all menus by first time. AppMenus::instance()->reload(); @@ -154,11 +156,14 @@ MainWindow::~MainWindow() { delete m_scalePanic; +#ifdef ENABLE_SCRIPTING if (m_devConsoleView) { if (m_devConsoleView->parent()) m_workspace->removeView(m_devConsoleView); delete m_devConsoleView; } +#endif + if (m_homeView) { if (m_homeView->parent()) m_workspace->removeView(m_homeView); diff --git a/src/app/ui/main_window.h b/src/app/ui/main_window.h index 5a7f8e51c..d7ea5bee7 100644 --- a/src/app/ui/main_window.h +++ b/src/app/ui/main_window.h @@ -114,9 +114,11 @@ namespace app { Workspace* m_workspace; PreviewEditorWindow* m_previewEditor; HomeView* m_homeView; - DevConsoleView* m_devConsoleView; Notifications* m_notifications; INotificationDelegate* m_scalePanic; +#ifdef ENABLE_SCRIPTING + DevConsoleView* m_devConsoleView; +#endif }; }