diff --git a/app/src/main/java/com/vectras/vm/MainActivity.java b/app/src/main/java/com/vectras/vm/MainActivity.java index 38cabee..50fd665 100644 --- a/app/src/main/java/com/vectras/vm/MainActivity.java +++ b/app/src/main/java/com/vectras/vm/MainActivity.java @@ -533,6 +533,10 @@ public class MainActivity extends AppCompatActivity { usedRam = findViewById(R.id.usedRam); freeRam = findViewById(R.id.freeRam); + + TextView tvIsRunning = findViewById(R.id.tvIsRunning); + + String vectrasMemory = String.valueOf(RamInfo.vectrasMemory()); TimerTask t = new TimerTask() { @Override @@ -540,6 +544,12 @@ public class MainActivity extends AppCompatActivity { runOnUiThread(new Runnable() { @Override public void run() { + boolean isMainServiceRunning = isServiceRunning(MainService.class, activity); + if (isMainServiceRunning) + tvIsRunning.setText(R.string.running); + else + tvIsRunning.setText(R.string.stopped); + ActivityManager.MemoryInfo miI = new ActivityManager.MemoryInfo(); ActivityManager activityManagerr = (ActivityManager) getSystemService(ACTIVITY_SERVICE); activityManagerr.getMemoryInfo(miI); @@ -844,14 +854,6 @@ public class MainActivity extends AppCompatActivity { TextView tvQemuArch = findViewById(R.id.qemuArch); tvQemuArch.setText(MainSettingsManager.getArch(activity)); - TextView tvIsRunning = findViewById(R.id.tvIsRunning); - boolean isMainServiceRunning = isServiceRunning(MainService.class, activity); - if (isMainServiceRunning) - tvIsRunning.setText(R.string.running); - else - tvIsRunning.setText(R.string.stopped); - - //TEMPORARY FIX FOR VNC CLOSES //TODO: FIND FIX FOR CRASHING if (MainSettingsManager.getVmUi(activity).equals("VNC") && MainVNCActivity.started) diff --git a/app/src/main/java/com/vectras/vm/StartVM.java b/app/src/main/java/com/vectras/vm/StartVM.java index 551c75e..5e5bba3 100644 --- a/app/src/main/java/com/vectras/vm/StartVM.java +++ b/app/src/main/java/com/vectras/vm/StartVM.java @@ -124,7 +124,9 @@ public class StartVM { params.add("-nodefaults"); - params.add(bios); + if (Objects.equals(MainSettingsManager.getArch(activity), "ARM64")) { + params.add(bios); + } params.add(boot);