Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix https://github.com/osmandapp/Osmand/issues/2240

Browse source
This commit is contained in:
Alexey Kulish 2016-02-29 09:47:08 +03:00
parent a5bd6bceea
commit a9fc79463f
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java
View file

@ -73,11 +73,13 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
} }
public WeakReference<AudioVideoNoteRecordingMenuFullScreenFragment> findMenuFragment() { public WeakReference<AudioVideoNoteRecordingMenuFullScreenFragment> findMenuFragment() {
Fragment fragment = getMapActivity().getSupportFragmentManager().findFragmentByTag(AudioVideoNoteRecordingMenuFullScreenFragment.TAG); MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(AudioVideoNoteRecordingMenuFullScreenFragment.TAG);
if (fragment != null && !fragment.isDetached()) { if (fragment != null && !fragment.isDetached()) {
return new WeakReference<>((AudioVideoNoteRecordingMenuFullScreenFragment) fragment); return new WeakReference<>((AudioVideoNoteRecordingMenuFullScreenFragment) fragment);
} else { }
}
return null; return null;
} }
} }
}

5
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -1913,10 +1913,10 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
public synchronized void shootAgain() { public synchronized void shootAgain() {
cancelPhotoTimer(); cancelPhotoTimer();
cam.cancelAutoFocus();
photoRawData = null; photoRawData = null;
if (cam != null) {
try { try {
cam.cancelAutoFocus();
cam.stopPreview(); cam.stopPreview();
cam.startPreview(); cam.startPreview();
internalShoot(); internalShoot();
@ -1929,6 +1929,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
e.printStackTrace(); e.printStackTrace();
} }
} }
}
public synchronized void finishPhotoRecording(boolean cancel) { public synchronized void finishPhotoRecording(boolean cancel) {
cancelPhotoTimer(); cancelPhotoTimer();