fix merge

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

Origin message was:
------------------
- fix merge

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-10-21 15:04:00 +02:00
parent 1d10defb4c
commit d5cf0fbcb6

View File

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