Unable to close add printer popup when no printer is added

This commit is contained in:
casperlamboo 2018-02-06 11:21:40 +01:00
parent 78764383e1
commit 34147a918e

View File

@ -458,7 +458,7 @@ class Settings extends React.Component {
</div> </div>
</Tab> </Tab>
</Tabs> </Tabs>
{printDialog(this.props, this.state, 'Add Printer', 'addPrinter', 'Add', addPrinter, this.closeAddPrinterDialog, null, this.addPrinter)} {printDialog(this.props, this.state, 'Add Printer', 'addPrinter', 'Add', addPrinter, localStorage.active && this.closeAddPrinterDialog, null, this.addPrinter)}
{printDialog(this.props, this.state, 'Manage Printer', 'managePrinter', 'Save', managePrinter, this.closeManagePrinterDialog, this.removeActivePrinter, this.editPrinter)} {printDialog(this.props, this.state, 'Manage Printer', 'managePrinter', 'Save', managePrinter, this.closeManagePrinterDialog, this.removeActivePrinter, this.editPrinter)}
</div> </div>
); );
@ -473,11 +473,11 @@ function printDialog(props, state, title, form, submitText, data, closeDialog, r
<Dialog <Dialog
title={title} title={title}
open={data.open} open={data.open}
onRequestClose={closeDialog} onRequestClose={closeDialog ? closeDialog : null}
contentStyle={{ maxWidth: '400px' }} contentStyle={{ maxWidth: '400px' }}
autoScrollBodyContent autoScrollBodyContent
actions={[ actions={[
<FlatButton closeDialog && <FlatButton
label="Cancel" label="Cancel"
onTouchTap={closeDialog} onTouchTap={closeDialog}
/>, />,