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 2626import processing .mode .java .JavaEditor ;
2727
2828import javax .swing .*;
29-
3029import javax .swing .event .ChangeEvent ;
3130import javax .swing .event .ChangeListener ;
3231import java .awt .event .ActionEvent ;
3332import java .awt .event .ActionListener ;
3433import java .io .File ;
3534import java .io .IOException ;
36- import java .util .Timer ;
3735import 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 ();
Original file line number Diff line number Diff 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 ) {
You can’t perform that action at this time.
0 commit comments