fix merge

Origin commit data
------------------
Commit: 311714f54b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix merge
This commit is contained in:
gixxpunk
2017-10-21 15:04:00 +02:00
parent a899930ccd
commit 57ee10ee78

View File

@@ -2572,6 +2572,9 @@ TIMER_START();
hdd->exec(NULL, "");
delete hdd;
hintBox->hide(); // InitZapper also displays a hintbox
delete hintBox;
cCA::GetInstance()->Ready(true);
//InitZapper();