Issue 819 don't copy to clipboard if not saving history, when activated by Intent

git-svn-id: https://zxing.googlecode.com/svn/trunk@1752 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-04-29 08:53:44 +00:00
parent 2e4e0d0c77
commit 07d165054b

View file

@ -220,7 +220,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true);
copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true)
&& (intent == null || intent.getBooleanExtra(Intents.Scan.SAVE_HISTORY, true));
beepManager.updatePrefs();