revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index a81934ee50b325beb6ecf356904d9afeb8f5c3c9..028cd74f4b8aeb3ef692be403e68e004bf782ff3 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -19,6 +19,7 @@
 #include "buffer.h"
 #include "bufferlist.h"
 #include "BufferView.h"
+#include "buffer_funcs.h"
 #include "cursor.h"
 #include "debug.h"
 #include "gettext.h"
@@ -216,7 +217,7 @@ void quitLyX(bool noask)
                Alert::warning(_("Unable to remove temporary directory"), msg);
        }
 
-       lyx_gui::exit();
+       lyx_gui::exit(0);
 }
 
 
@@ -342,7 +343,9 @@ void newFile(BufferView * bv, string const & filename)
                            << "\nName is " << name
                            << "\nTemplate is " << tmpname << endl;
 
-       bv->newFile(name, tmpname);
+       Buffer * const b = newFile(name, tmpname);
+       if (b)
+               bv->setBuffer(b);
 }