# HG changeset patch # User Ritor1 # Date 1358708824 -21600 # Node ID 1bcaa67d05e0e9fa7c67af4e34c9c2fd929873d5 # Parent ac65389dc2110953559bc95e40188f0aee2ca7e8# Parent c261e0eea3c95b465f0ebe790c0df81e5cc49af1 Слияние diff -r ac65389dc211 -r 1bcaa67d05e0 mm7_5.cpp --- a/mm7_5.cpp Mon Jan 21 01:06:55 2013 +0600 +++ b/mm7_5.cpp Mon Jan 21 01:07:04 2013 +0600 @@ -1208,6 +1208,7 @@ else { if ( pCurrentScreen >= 14 || pCurrentScreen == 4 || pCurrentScreen == 10 ) + { //goto LABEL_229; if ( dword_50CDC8 ) goto LABEL_232; @@ -1215,6 +1216,7 @@ //goto LABEL_231; uMessageParam = v0; goto LABEL_232; + } if ( pCurrentScreen == 13 && !dword_50CDC8 && !dword_5C35C8 ) { CloseWindowBackground();