From 3c3cf98b1d4db2038d3888cbc9fa57e156b19873 Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <thomas.zarebczan@gmail.com>
Date: Tue, 5 Jun 2018 11:22:15 -0400
Subject: [PATCH] fix 1549

---
 src/main/createWindow.js           | 6 +++++-
 src/renderer/page/rewards/view.jsx | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/createWindow.js b/src/main/createWindow.js
index 764003c65..4d4a5bc25 100644
--- a/src/main/createWindow.js
+++ b/src/main/createWindow.js
@@ -64,8 +64,12 @@ export default appState => {
     //     path, so we just strip it off.
     //   - In a URI with a claim ID, like lbry://channel#claimid, Windows interprets the hash mark as
     //     an anchor and converts it to lbry://channel/#claimid. We remove the slash here as well.
+    //   - ? also interpreted as an anchor, remove slash also.
     if (process.platform === 'win32') {
-      deepLinkingURI = deepLinkingURI.replace(/\/$/, '').replace('/#', '#');
+      deepLinkingURI = deepLinkingURI
+        .replace(/\/$/, '')
+        .replace('/#', '#')
+        .replace('/?', '?');
     }
   } else {
     deepLinkingURI = appState.macDeepLinkingURI;
diff --git a/src/renderer/page/rewards/view.jsx b/src/renderer/page/rewards/view.jsx
index c7b076439..c1ad7d57f 100644
--- a/src/renderer/page/rewards/view.jsx
+++ b/src/renderer/page/rewards/view.jsx
@@ -49,7 +49,7 @@ class RewardsPage extends React.PureComponent<Props> {
   renderPageHeader() {
     const { doAuth, navigate, user, daemonSettings } = this.props;
 
-    if (user && !user.is_reward_approved && daemonSettings.share_usage_data) {
+    if (user && !user.is_reward_approved && daemonSettings && daemonSettings.share_usage_data) {
       if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) {
         return (
           <section className="card card--section">
@@ -98,7 +98,7 @@ class RewardsPage extends React.PureComponent<Props> {
   renderUnclaimedRewards() {
     const { fetching, rewards, user, daemonSettings, navigate } = this.props;
 
-    if (!daemonSettings.share_usage_data) {
+    if (daemonSettings && !daemonSettings.share_usage_data) {
       return (
         <div className="card card--section">
           <div className="card__title">{__('Disabled')}</div>