X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/61e6191342ec1ae8324ea8ec163a5f31d49f6a07..eda6f714913d16cdfd269b48c2afd712b3232506:/src/com/owncloud/android/ui/activity/FileActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index b38e77b8..4e38c523 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -779,14 +779,15 @@ public class FileActivity extends ActionBarActivity i.putExtra(ConflictsResolveActivity.EXTRA_FILE, syncedFile); i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, getAccount()); startActivity(i); - } + } else { if (!operation.transferWasRequested()) { Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), Toast.LENGTH_LONG); msg.show(); } + invalidateOptionsMenu(); } }