Commit f5f351c570708f4ca923eeecee483874e673a277

Bertram <bertram @ceg…el.net>
Wed Oct 21 23:11:50 CEST 2009

Tree SHA1: 9f40ab7
Parent SHA1: 7fc4b12 (Fix RegisterDialog tab order and detail lengths)
raw diff | raw patch

Made the skip updates (-u) and set custom data path (-d) startup options work again, even separately.

Be aware, that skiping the updates download does still the already downloaded data files.

If needed, a "don't use updates" options should be made to explicitely get temporary rid of updates files.

Diff rendering mode:
inline
side by side


920	920
921	921	if (state != oldstate)
922	922	{
923		// Load updates after exiting the update state
924		if (oldstate == STATE_UPDATE)
925		{
926		loadUpdates();
927		}
928
929	923	//printf("State change: %d to %d\n", oldstate, state);
930	924
931	925	oldstate = state;
…	…
1019	1019	break;
1020	1020
1021	1021	case STATE_UPDATE:
	1022
	1023	// Determine which source to use for the update host
	1024	if (!options.updateHost.empty())
	1025	updateHost = options.updateHost;
	1026	else
	1027	updateHost = loginData.updateHost;
	1028	setUpdatesDir();
	1029
1022	1030	if (options.skipUpdate)
1023	1031	{
1024	1032	state = STATE_LOAD_DATA;
1025	1033	}
1026	1034	else
1027	1035	{
1028		// Determine which source to use for the update host
1029		if (!options.updateHost.empty())
1030		updateHost = options.updateHost;
1031		else
1032		updateHost = loginData.updateHost;
1033
1034		setUpdatesDir();
1035	1036	logger->log("State: UPDATE");
1036	1037	currentDialog = new UpdaterWindow(updateHost,
1037	1038	homeDir + "/" + updatesDir);
…	…
1042	1042	case STATE_LOAD_DATA:
1043	1043	logger->log("State: LOAD DATA");
1044	1044
1045		// Add customdata directory
	1045	// Load the updates downloaded so far...
	1046	loadUpdates();
	1047
	1048	// Also add customdata directory
1046	1049	ResourceManager::getInstance()->searchAndAddArchives(
1047	1050	"customdata/",
1048	1051	"zip",

Commit f5f351c570708f4ca923eeecee483874e673a277

Gitorious