mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-15 02:08:00 +00:00
Merge branch 'master' into 'master'
[Mobile] prevent NPE on deck import See merge request core-developers/forge!5560
This commit is contained in:
@@ -63,7 +63,10 @@ public class FDeckImportDialog extends FDialog {
|
||||
|
||||
callback = callback0;
|
||||
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() {
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user