Subversion Repositories spk

Rev

Rev 247 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 247 Rev 278
Line 946... Line 946...
946 
			return false;
 946 
			return false;
947 
		}
 947 
		}
948 
 
 948 
 
949 
		// clear selected
 949 
		// clear selected
950 
		this->ClearSelectedItems();
 950 
		this->ClearSelectedItems();
- 
 
 951 
 
- 
 
 952 
		bool hasArchive = false;
- 
 
 953 
		auto list = m_pPackages->GetInstallPackageList();
- 
 
 954 
		for (auto itr = list->Front(); itr; itr = itr->next()) {
- 
 
 955 
			if (itr->Data()->GetType() == TYPE_ARCHIVE) {
- 
 
 956 
				hasArchive = true;
- 
 
 957 
				break;
- 
 
 958 
			}
- 
 
 959 
		}
951 
 
 960 
 
952 
		// lets install them now
 961 
		// lets install them now
953 
		CLinkList<CBaseFile> lCheckPackages;
 962 
		CLinkList<CBaseFile> lCheckPackages;
954 
		if ( m_pPackages->CheckPreparedInstallRequired(&lCheckPackages) )
 963 
		if ( m_pPackages->CheckPreparedInstallRequired(&lCheckPackages) )
955 
		{
 964 
		{
Line 1063... Line 1072...
1063 
			if ( background )
 1072 
			if ( background )
1064 
				this->StartBackground(MGUI_BACKGROUND_INSTALLBUILTIN);
 1073 
				this->StartBackground(MGUI_BACKGROUND_INSTALLBUILTIN);
1065 
			else
 1074 
			else
1066 
				this->DoInstall(builtin, false);
 1075 
				this->DoInstall(builtin, false);
1067 
		}
 1076 
		}
1068 
		else if ( archive )
 1077 
		else if ( archive && hasArchive)
1069 
		{
 1078 
		{
1070 
			if ( background )
 1079 
			if ( background )
1071 
				this->StartBackground(MGUI_BACKGROUND_INSTALL);
 1080 
				this->StartBackground(MGUI_BACKGROUND_INSTALL);
1072 
			else
 1081 
			else
1073 
				this->DoInstall(false, false);
 1082 
				this->DoInstall(false, false);