UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Don't make the apps_container_storage a global variable

Browse Source
This commit is contained in:
Romain Goyet
2018-04-10 15:04:58 +02:00
parent 73af1a3d36
commit 5b379010d8
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/main.cpp
View File

@@ -1,8 +1,6 @@
#include "apps_container_storage.h"
#include "global_preferences.h"
AppsContainerStorage container;
void ion_main(int argc, char * argv[]) {
#if EPSILON_GETOPT
for (int i=1; i<argc; i++) {
@@ -30,8 +28,8 @@ void ion_main(int argc, char * argv[]) {
* $ ./epsilon.elf --code-script hello_world.py:print("hello") --code-lock-on-console
*/
const char * appNames[] = {"home", EPSILON_APPS_NAMES};
for (int j = 0; j < container.numberOfApps(); j++) {
App::Snapshot * snapshot = container.appSnapshotAtIndex(j);
for (int j = 0; j < AppsContainerStorage::sharedContainer()->numberOfApps(); j++) {
App::Snapshot * snapshot = AppsContainerStorage::sharedContainer()->appSnapshotAtIndex(j);
int cmp = strcmp(argv[i]+2, appNames[j]);
if (cmp == '-') {
snapshot->setOpt(argv[i]+2+strlen(appNames[j])+1, argv[i+1]);
@@ -40,5 +38,5 @@ void ion_main(int argc, char * argv[]) {
}
}
#endif
container.run();
AppsContainerStorage::sharedContainer()->run();
}