Attachment #270365 for bug #364009




		delete [] xml;

		fillConfigurationComboBox();
		QString temporary = QFileInfo(configFileName).completeBaseName();
		selectConfiguration(&temporary, PLUGIN_CONFIG_USER);
	}

	delete [] configDirectory;

	disableGenericSlots = true;
	options->getPresetConfiguration(&configurationName, &configurationType);

	QString temporary2 = QString(configurationName);
	bool foundConfig = selectConfiguration(&temporary2, configurationType);

	if (!foundConfig)
		printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);

Return to bug 364009

Lines 343-349 Link Here

(-)avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp (-2 / +4 lines)
343	delete [] xml;	343	delete [] xml;
344		344
345	fillConfigurationComboBox();	345	fillConfigurationComboBox();
346	selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);	346	QString temporary = QFileInfo(configFileName).completeBaseName();
		347	selectConfiguration(&temporary, PLUGIN_CONFIG_USER);
347	}	348	}
348		349
349	delete [] configDirectory;	350	delete [] configDirectory;
Lines 580-586 Link Here
580	disableGenericSlots = true;	581	disableGenericSlots = true;
581	options->getPresetConfiguration(&configurationName, &configurationType);	582	options->getPresetConfiguration(&configurationName, &configurationType);
582		583
583	bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);	584	QString temporary2 = QString(configurationName);
		585	bool foundConfig = selectConfiguration(&temporary2, configurationType);
584		586
585	if (!foundConfig)	587	if (!foundConfig)
586	printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType);	588	printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType);