external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
[Mobile] prevent NPE on deck import

See merge request core-developers/forge!5560
This commit is contained in:
Anthony Calosa
2021-10-16 06:46:36 +00:00
parent 3a7878f182 b7e6d51f97
commit 9e29e98e89
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
View File

@@ -63,7 +63,10 @@ public class FDeckImportDialog extends FDialog {
callback = callback0; callback = callback0;
controller = new DeckImportController(replacingDeck, newEditionCheck, dateTimeCheck, onlyCoreExpCheck, monthDropdown, yearDropdown); controller = new DeckImportController(replacingDeck, newEditionCheck, dateTimeCheck, onlyCoreExpCheck, monthDropdown, yearDropdown);
txtInput.setText(Forge.getClipboard().getContents()); //just pull import directly off the clipboard String contents = Forge.getClipboard().getContents();
if (contents == null)
contents = ""; //prevent NPE
txtInput.setText(contents);
initButton(0, Localizer.getInstance().getMessage("lblImport"), new FEventHandler() { initButton(0, Localizer.getInstance().getMessage("lblImport"), new FEventHandler() {
@Override @Override