From f252c3ebd17489de22c6128e0880da193948373b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Tue, 10 Dec 2019 15:46:14 +0100
Subject: [PATCH] Do proper check that config is present

---
 app/src/components/ChooseRoom.js      | 8 ++++----
 app/src/components/Controls/TopBar.js | 4 ++--
 app/src/components/JoinDialog.js      | 8 ++++----
 app/src/components/Room.js            | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/components/ChooseRoom.js b/app/src/components/ChooseRoom.js
index b83962b..15b3955 100644
--- a/app/src/components/ChooseRoom.js
+++ b/app/src/components/ChooseRoom.js
@@ -29,7 +29,7 @@ const styles = (theme) =>
 			width                : '100%',
 			height               : '100%',
 			backgroundColor      : 'var(--background-color)',
-			backgroundImage      : `url(${window.config.background})`,
+			backgroundImage      : `url(${window.config ? window.config.background : null})`,
 			backgroundAttachment : 'fixed',
 			backgroundPosition   : 'center',
 			backgroundSize       : 'cover',
@@ -118,9 +118,9 @@ const DialogTitle = withStyles(styles)((props) =>
 
 	return (
 		<MuiDialogTitle disableTypography className={classes.dialogTitle} {...other}>
-			{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
+			{ window.config && window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
 			<Typography variant='h5'>{children}</Typography>
-			{ window.config.loginEnabled &&
+			{ window.config && window.config.loginEnabled &&
 				<Tooltip
 					onClose={handleTooltipClose}
 					onOpen={handleTooltipOpen}
@@ -191,7 +191,7 @@ const ChooseRoom = ({
 						loggedIn ? roomClient.logout() : roomClient.login();
 					}}
 				>
-					{ window.config.title }
+					{ window.config && window.config.title ? window.config.title : 'Multiparty meeting' }
 					<hr />
 				</DialogTitle>
 				<DialogContent>
diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js
index 21c09b0..444743d 100644
--- a/app/src/components/Controls/TopBar.js
+++ b/app/src/components/Controls/TopBar.js
@@ -184,14 +184,14 @@ const TopBar = (props) =>
 						<MenuIcon />
 					</IconButton>
 				</PulsingBadge>
-				{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
+				{ window.config && window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
 				<Typography
 					className={classes.title}
 					variant='h6'
 					color='inherit'
 					noWrap
 				>
-					{ window.config.title }
+					{ window.config && window.config.title ? window.config.title : 'Multiparty meeting' }
 				</Typography>
 				<div className={classes.grow} />
 				<div className={classes.actionButtons}>
diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js
index 040542e..9e55805 100644
--- a/app/src/components/JoinDialog.js
+++ b/app/src/components/JoinDialog.js
@@ -28,7 +28,7 @@ const styles = (theme) =>
 			width                : '100%',
 			height               : '100%',
 			backgroundColor      : 'var(--background-color)',
-			backgroundImage      : `url(${window.config.background})`,
+			backgroundImage      : `url(${window.config ? window.config.background : null})`,
 			backgroundAttachment : 'fixed',
 			backgroundPosition   : 'center',
 			backgroundSize       : 'cover',
@@ -117,9 +117,9 @@ const DialogTitle = withStyles(styles)((props) =>
 
 	return (
 		<MuiDialogTitle disableTypography className={classes.dialogTitle} {...other}>
-			{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
+			{ window.config && window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
 			<Typography variant='h5'>{children}</Typography>
-			{ window.config.loginEnabled &&
+			{ window.config && window.config.loginEnabled &&
 				<Tooltip
 					onClose={handleTooltipClose}
 					onOpen={handleTooltipOpen}
@@ -212,7 +212,7 @@ const JoinDialog = ({
 						loggedIn ? roomClient.logout() : roomClient.login();
 					}}
 				>
-					{ window.config.title }
+					{ window.config && window.config.title ? window.config.title : 'Multiparty meeting' }
 					<hr />
 				</DialogTitle>
 				<DialogContent>
diff --git a/app/src/components/Room.js b/app/src/components/Room.js
index 2410687..2863962 100644
--- a/app/src/components/Room.js
+++ b/app/src/components/Room.js
@@ -34,7 +34,7 @@ const styles = (theme) =>
 			width                : '100%',
 			height               : '100%',
 			backgroundColor      : 'var(--background-color)',
-			backgroundImage      : `url(${window.config.background})`,
+			backgroundImage      : `url(${window.config ? window.config.background : null})`,
 			backgroundAttachment : 'fixed',
 			backgroundPosition   : 'center',
 			backgroundSize       : 'cover',