X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fwwindow.C;h=4f522f3179f099de3ee2622836771b6a3534a6eb;hp=e0db1b7ca4d0ab1101625c68795da36e4457a480;hb=HEAD;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/wwindow.C b/cinelerra-5.1/cinelerra/wwindow.C
index e0db1b7c..4f522f31 100644
--- a/cinelerra-5.1/cinelerra/wwindow.C
+++ b/cinelerra-5.1/cinelerra/wwindow.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "bcdisplayinfo.h"
@@ -31,6 +31,7 @@ WWindow::WWindow(MWindow *mwindow)
  : BC_DialogThread()
 {
 	this->mwindow = mwindow;
+	this->result = 0;
 }
 
 WWindow::~WWindow()
@@ -43,11 +44,13 @@ void WWindow::show_warning(int *do_warning, const char *warn_text)
 	if( running() ) return;
 	this->do_warning = do_warning;
 	this->warn_text = warn_text;
+	this->result = 0;
 	start();
 }
 
 void WWindow::handle_close_event(int result)
 {
+	this->result = result;
 	gui = 0;
 }
 
@@ -61,6 +64,13 @@ BC_Window* WWindow::new_gui()
 	return gui;
 }
 
+int WWindow::wait_result()
+{
+	if( !running() ) return -1;
+	join();
+	return result;
+}
+
 WWindowGUI::WWindowGUI(WWindow *thread, int x, int y)
  : BC_Window(_(PROGRAM_NAME ": Warning"), x, y, 640, 100, 640, 100, 0, 0, 1)
 {
@@ -69,6 +79,7 @@ WWindowGUI::WWindowGUI(WWindow *thread, int x, int y)
 
 void WWindowGUI::create_objects()
 {
+	lock_window("WWindowGUI::create_objects");
 	int x = 10, y = 10;
 	add_subwindow(new BC_TextBox(x, y, get_w()-50, 3, thread->warn_text));
 	y = get_h() - 30;
@@ -77,6 +88,7 @@ void WWindowGUI::create_objects()
 	x = get_w() - BC_CancelButton::calculate_w() - 10;
 	add_subwindow(new BC_CancelButton(x, y));
 	show_window();
+	unlock_window();
 }
 
 WDisable::WDisable(WWindowGUI *gui, int x, int y)