X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=2918e23e63e59e4035bb86e2b07059ea0536fd2e;hb=HEAD;hp=9d71e561103f80a42d237bb66926232c5c83baf6;hpb=6bc0a304ee802c8d05bf9faadd17229696fec5d3;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 9d71e561..1291b992 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1,6 +1,7 @@
 /*
  * CINELERRA
  * Copyright (C) 1997-2014 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * 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
@@ -283,8 +284,10 @@ MWindow::~MWindow()
 	delete convert_render;  convert_render = 0;
 	delete render;          render = 0;
 	delete mixers_align;    mixers_align = 0;
+#ifdef HAVE_COMMERCIALS
 	commit_commercial();
 	if( commercials && !commercials->remove_user() ) commercials = 0;
+#endif
 	close_mixers();
 	if( speed_edl ) { speed_edl->remove_user();  speed_edl = 0; }
 // Save defaults for open plugins
@@ -2218,6 +2221,13 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 			}
 			result = 0;
 			break; }
+// File is a list and size of listed files don't match
+  case FILE_SIZE_DONT_MATCH: {
+   eprintf(_("File sizes don't match"));
+   sprintf(string, _("File sizes don't match"));
+   gui->show_message(string, theme->message_error);
+   gui->update_default_message();
+   break; }
 
 		case FILE_NOT_FOUND: {
 			eprintf(_("Failed to open %s"), new_asset->path);
@@ -5294,7 +5304,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 		int channels = 0;
 		for( uint64_t mask=channel_mask; mask!=0; mask>>=1 ) channels += mask & 1;
 		if( channels < 1 ) channels = 1;
-		if( channels > 6 ) channels = 6;
+		if( channels > MAXCHANNELS ) channels = MAXCHANNELS;
 		session->audio_tracks = session->audio_channels = channels;
 
 		int *achannel_positions = preferences->channel_positions[session->audio_channels-1];