File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
src/processing/mode/android Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 26
26
import processing .mode .java .JavaEditor ;
27
27
28
28
import javax .swing .*;
29
-
30
29
import javax .swing .event .ChangeEvent ;
31
30
import javax .swing .event .ChangeListener ;
32
31
import java .awt .event .ActionEvent ;
33
32
import java .awt .event .ActionListener ;
34
33
import java .io .File ;
35
34
import java .io .IOException ;
36
- import java .util .Timer ;
37
35
import java .util .TimerTask ;
38
36
39
37
@ SuppressWarnings ("serial" )
@@ -50,6 +48,8 @@ public UpdateDeviceListTask(JMenu deviceMenu) {
50
48
51
49
@ Override
52
50
public void run () {
51
+ if (androidMode .getSDK () == null ) return ;
52
+
53
53
final Devices devices = Devices .getInstance ();
54
54
java .util .List <Device > deviceList = devices .findMultiple (false );
55
55
Device selectedDevice = devices .getSelectedDevice ();
@@ -212,7 +212,7 @@ public void actionPerformed(ActionEvent e) {
212
212
213
213
// start updating device menus
214
214
UpdateDeviceListTask task = new UpdateDeviceListTask (deviceMenu );
215
- Timer timer = new Timer ();
215
+ java . util . Timer timer = new java . util . Timer ();
216
216
timer .schedule (task , 5000 , 5000 );
217
217
218
218
menu .addSeparator ();
Original file line number Diff line number Diff line change @@ -95,6 +95,8 @@ protected Object doInBackground() throws Exception {
95
95
Runtime .getRuntime ().exec ("chmod -R 755 " + sdkFolder .getAbsolutePath ());
96
96
}
97
97
98
+ tempFolder .delete ();
99
+
98
100
Base .getPlatform ().setenv ("ANDROID_SDK" , sdkFolder .getAbsolutePath ());
99
101
androidMode .loadSDK ();
100
102
} catch (ParserConfigurationException e ) {
You can’t perform that action at this time.
0 commit comments