Don't load or validate apikeys if SC_NO_NETWORKING is defined

Jundarer · Jan 10, 2019 · bfff0fd · bfff0fd
1 parent 072b13f
commit bfff0fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/engine/interfaces/sc_http.cpp b/engine/interfaces/sc_http.cpp
@@ -535,8 +535,9 @@ int http::get( std::string&       result,
     }
   }
 
-  // No result from the download process, grab it from the cache
-  if ( result.empty() )
+  // No result from the download process, grab it from the cache, only if the download process was
+  // returned OK status.
+  if ( result.empty() && response_code == 200 )
   {
     result = entry.result;
   }

diff --git a/engine/sim/sc_sim.cpp b/engine/sim/sc_sim.cpp
@@ -1023,6 +1023,7 @@ struct regen_event_t : public event_t
   }
 };
 
+#ifndef SC_NO_NETWORKING
 /// List of files from which to look for Blizzard API key
 std::vector<std::string> get_api_key_locations()
 {
@@ -1093,11 +1094,12 @@ std::string get_api_key()
     }
   }
 
-#if defined(SC_DEFAULT_APIKEY)
+#if defined( SC_DEFAULT_APIKEY )
   return std::string(SC_DEFAULT_APIKEY);
-#endif
+#endif /* SC_DEFAULT_APIKEY */
   return std::string();
 }
+#endif /* SC_NO_NETWORKING */
 
 /// Setup a periodic check for Bloodlust
 struct bloodlust_check_t : public event_t
@@ -1399,7 +1401,9 @@ sim_t::sim_t() :
   solo_raid( false ),
   global_item_upgrade_level( 0 ),
   maximize_reporting( false ),
+#ifndef SC_NO_NETWORKING
   apikey( get_api_key() ),
+#endif
   distance_targeting_enabled( false ),
   ignore_invulnerable_targets( false ),
   enable_dps_healing( false ),