Skip to content

Commit 1ab6a75

Browse files
committed
Do not run updatedevicelist task when sdk is not available
1 parent 0c85eef commit 1ab6a75

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/processing/mode/android/AndroidEditor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@
2626
import processing.mode.java.JavaEditor;
2727

2828
import javax.swing.*;
29-
3029
import javax.swing.event.ChangeEvent;
3130
import javax.swing.event.ChangeListener;
3231
import java.awt.event.ActionEvent;
3332
import java.awt.event.ActionListener;
3433
import java.io.File;
3534
import java.io.IOException;
36-
import java.util.Timer;
3735
import java.util.TimerTask;
3836

3937
@SuppressWarnings("serial")
@@ -50,6 +48,8 @@ public UpdateDeviceListTask(JMenu deviceMenu) {
5048

5149
@Override
5250
public void run() {
51+
if(androidMode.getSDK() == null) return;
52+
5353
final Devices devices = Devices.getInstance();
5454
java.util.List<Device> deviceList = devices.findMultiple(false);
5555
Device selectedDevice = devices.getSelectedDevice();
@@ -212,7 +212,7 @@ public void actionPerformed(ActionEvent e) {
212212

213213
// start updating device menus
214214
UpdateDeviceListTask task = new UpdateDeviceListTask(deviceMenu);
215-
Timer timer = new Timer();
215+
java.util.Timer timer = new java.util.Timer();
216216
timer.schedule(task, 5000, 5000);
217217

218218
menu.addSeparator();

src/processing/mode/android/SDKDownloader.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ protected Object doInBackground() throws Exception {
9595
Runtime.getRuntime().exec("chmod -R 755 " + sdkFolder.getAbsolutePath());
9696
}
9797

98+
tempFolder.delete();
99+
98100
Base.getPlatform().setenv("ANDROID_SDK", sdkFolder.getAbsolutePath());
99101
androidMode.loadSDK();
100102
} catch (ParserConfigurationException e) {

0 commit comments

Comments
 (0)