[[project @ 12] googlecode@antlersoft.com**20090116022218 Ignore-this: 8078134a6eefe57fe6aca16974ed5c Make default color model in spinner C64; fix closing connection onStop() ] hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 99 - protected void onPause() { + protected void onStop() { hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 101 - super.onPause(); + super.onStop(); hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 105 - protected void onResume() { + protected void onRestart() { hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 107 - super.onResume(); + super.onRestart(); hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 247 + { + vncCanvas.closeConnection(); hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 250 + } hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 290 - @Override - public void onStop() { - vncCanvas.closeConnection(); - super.onStop(); - } - hunk ./androidVNC/src/android/androidVNC/androidVNC.java 54 - ArrayAdapter colorSpinnerAdapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, COLORMODEL.values()); + COLORMODEL[] models=COLORMODEL.values(); + ArrayAdapter colorSpinnerAdapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, models); + int indexC64; + for ( indexC64=0; models[indexC64] != COLORMODEL.C64; ++indexC64); hunk ./androidVNC/src/android/androidVNC/androidVNC.java 59 - colorSpinner.setSelection(0); + colorSpinner.setSelection(indexC64); hunk ./androidVNC/src/android/androidVNC/androidVNC.java 62 + @Override