vlp-18 Fixed closing kernel with 'x' of window

[vlp.git] / src / edit / editor.cpp

diff --git a/src/edit/editor.cpp b/src/edit/editor.cpp
index 096f5aea3f49f6162954005b1cf1b416a45f29e0..2e119deb2cb4acea4b941bd757cd745426496815 100644 (file)
--- a/src/edit/editor.cpp
+++ b/src/edit/editor.cpp
@@ -25,7 +25,7 @@
 
 #define TYPENUM        5
 
-Editor *e;
+Editor *editor;
 
 /**
  * @attention Currently not in use
@@ -64,10 +64,11 @@ void My_Edit::keyPressEvent(QKeyEvent *ev)
 }
 
 /**
+ * Event invoked on program close.
  * @copydoc QWidget::closeEvent(QCloseEvent*)
  */
 void Editor::closeEvent(QCloseEvent * e) {
-       e->ignore();
+       e->accept();
 }
 
 /**
@@ -172,7 +173,7 @@ void Editor::updateline()
 }
 
 /**
- * Event invoked when resizing editor window.
+ * Event invoked on resizing editor application window.
  * @copydoc QWidget::resizeEvent(QResizeEvent*)
  * @param event Currently does nothing
  */
@@ -669,14 +670,12 @@ void Editor::find_next()
  */
 int main(int argc, char **argv)
 {
-       QApplication a(argc, argv);
-       //a.setStyle(WindowsStyle);
-       /*
-       Defaults are zeroed, so created Editor widget become top-level window.
-       */
-       e = new Editor(argv[1]);
-       e->resize(600, 400);
-       e->show();
-       return a.exec();
+       QApplication app(argc, argv);
+       //app.setStyle(WindowsStyle);
+       editor = new Editor(argv[1]);
+       app.setMainWidget(editor);
+       editor->resize(600, 400);
+       editor->show();
+       return app.exec();
 }