Merge branch 'master' of github.com:Fluorohydride/ygopro into multi-layer-lp

gframe/deck_con.cpp

@@ -118,6 +118,7 @@ void DeckBuilder::Terminate() {
 	mainGame->showingcode = 0;
 	mainGame->scrFilter->setVisible(false);
 	mainGame->scrPackCards->setVisible(false);
+	mainGame->scrPackCards->setPos(0);
 	int catesel = mainGame->cbDBCategory->getSelected();
 	if(catesel >= 0)
 		BufferIO::CopyWStr(mainGame->cbDBCategory->getItem(catesel), mainGame->gameConf.lastcategory, 64);
@@ -1679,6 +1680,7 @@ void DeckBuilder::RefreshPackListScroll() {
 		}
 	} else {
 		mainGame->scrPackCards->setVisible(false);
+		mainGame->scrPackCards->setPos(0);
 	}
 }
 void DeckBuilder::ChangeCategory(int catesel) {

gframe/drawing.cpp

@@ -760,10 +760,10 @@ void Game::DrawStatus(ClientCard* pcard, int x1, int y1, int x2, int y2) {
 	}
 }
 void Game::DrawGUI() {
-	if(imageLoading.size()) {
-		for(auto mit = imageLoading.begin(); mit != imageLoading.end(); ++mit)
-			mit->first->setImage(imageManager.GetTexture(mit->second));
-		imageLoading.clear();
+	while (imageLoading.size()) {
+		auto mit = imageLoading.cbegin();
+		mit->first->setImage(imageManager.GetTexture(mit->second));
+		imageLoading.erase(imageLoading.begin());
 	}
 	for(auto fit = fadingList.begin(); fit != fadingList.end();) {
 		auto fthis = fit++;