diff options
| author | JoramWilander <jwawilander@gmail.com> | 2016-02-08 07:28:04 -0500 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2016-02-08 07:28:04 -0500 |
| commit | 39b35b7b394cdc2391beaff8b96cd733400ebcb8 (patch) | |
| tree | 8069d1a9101f955c624a972bca623bd95b1fd7ed | |
| parent | c90e224349eb6105ef1d3ecf20c519238ba5e018 (diff) | |
| download | chat-39b35b7b394cdc2391beaff8b96cd733400ebcb8.tar.gz chat-39b35b7b394cdc2391beaff8b96cd733400ebcb8.tar.bz2 chat-39b35b7b394cdc2391beaff8b96cd733400ebcb8.zip | |
Fix cancel bug
| -rw-r--r-- | web/react/components/user_settings/user_settings_modal.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx index 57796d559..e0b72157b 100644 --- a/web/react/components/user_settings/user_settings_modal.jsx +++ b/web/react/components/user_settings/user_settings_modal.jsx @@ -216,7 +216,9 @@ class UserSettingsModal extends React.Component { } else { if (this.state.active_section === 'theme' && section !== 'theme') { const user = UserStore.getCurrentUser(); - Utils.applyTheme(user.theme_props); + if (user.theme_props != null) { + Utils.applyTheme(user.theme_props); + } } this.setState({active_section: section}); } |