mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-10 07:08:28 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3010cd24d7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1126,9 +1126,12 @@ int CTestMenu::showTestMenu()
|
||||
w_test.setFooter(footerButtons, 2);
|
||||
w_test.addKey(CRCInput::RC_red, this, "footer_key");
|
||||
w_test.addKey(CRCInput::RC_green, this, "footer_key");
|
||||
|
||||
int res = w_test.exec(NULL, "");
|
||||
delete w_hw;
|
||||
delete w_cc;
|
||||
delete w_msg;
|
||||
//exit
|
||||
return w_test.exec(NULL, "");;
|
||||
return res;
|
||||
}
|
||||
|
||||
void CTestMenu::showCCTests(CMenuWidget *widget)
|
||||
|
Reference in New Issue
Block a user