mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-17 18:33:35 +02:00
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:
@@ -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();
|
||||
|
||||
|
Reference in New Issue
Block a user