X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetremove.C;h=49e82414035c41d252d25b8f81246e27cbbe7c5c;hb=eecf057a9d6b8c8cffc7d0001bff89bc9cac7b05;hp=72918f9e96bb862667ae080cd7e8dde5ce782186;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/assetremove.C b/cinelerra-5.1/cinelerra/assetremove.C
index 72918f9e..49e82414 100644
--- a/cinelerra-5.1/cinelerra/assetremove.C
+++ b/cinelerra-5.1/cinelerra/assetremove.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 "assetremove.h"
@@ -29,15 +29,15 @@
 
 
 AssetRemoveWindow::AssetRemoveWindow(MWindow *mwindow)
- : BC_Window(_(PROGRAM_NAME ": Remove assets"), 
+ : BC_Window(_(PROGRAM_NAME ": Remove assets"),
 	mwindow->gui->get_abs_cursor_x(1),
 	mwindow->gui->get_abs_cursor_y(1),
-	320, 
-	400, 
-	-1, 
-	-1, 
+	320,
+	400,
+	-1,
+	-1,
+	0,
 	0,
-	0, 
 	1)
 {
 	this->mwindow = mwindow;
@@ -46,7 +46,10 @@ AssetRemoveWindow::AssetRemoveWindow(MWindow *mwindow)
 
 AssetRemoveWindow::~AssetRemoveWindow()
 {
-	delete data;
+	if( data ) {
+		data->remove_all_objects();
+		delete data;
+	}
 }
 
 void AssetRemoveWindow::create_objects()
@@ -69,9 +72,9 @@ void AssetRemoveWindow::create_objects()
 	y += title->get_h() + margin;
 	BC_ListBox *list;
 	add_subwindow(list = new BC_ListBox(
-		x, 
-		y, 
-		get_w() - x * 2, 
+		x,
+		y,
+		get_w() - x * 2,
 		get_h() - y - BC_OKButton::calculate_h() - margin * 2,
 		LISTBOX_TEXT,
 		data));
@@ -97,7 +100,7 @@ void AssetRemoveThread::run()
 	window->create_objects();
 	int result = window->run_window();
 	delete window;
-	
+
 	if(!result)
 	{
 		mwindow->remove_assets_from_disk();