From 0616ce62eb7f051e661b08359fbb6507f527f812 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 25 Jun 2021 00:15:49 -0400
Subject: [PATCH] Rearrange so loading from one doesn't override the other

---
 client/homebrew/pages/newPage/newPage.jsx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 01fd9d916..dcaff6a31 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -64,18 +64,17 @@ const NewPage = createClass({
 	},
 
 	componentDidMount : function() {
-		const brewStorage = localStorage.getItem(BREWKEY);
-		if(!this.props.brew.text && brewStorage){
-			this.setState({
-				brew : { text: brewStorage }
-			});
-		};
+		const brewStorage  = localStorage.getItem(BREWKEY);
 		const styleStorage = localStorage.getItem(STYLEKEY);
-		if(!this.props.brew.style && styleStorage){
+
+		if(!this.props.brew.text || !this.props.brew.style){
 			this.setState({
-				brew : { style: styleStorage }
+				brew : {
+					text  : this.props.brew.text  || (brewStorage  ?? ''),
+					style : this.props.brew.style || (styleStorage ?? undefined)
+				}
 			});
-		};
+		}
 
 		this.setState((prevState)=>({
 			htmlErrors : Markdown.validate(prevState.brew.text)