From 1362abc70d027a635e6259abd0d3038cf89c30c2 Mon Sep 17 00:00:00 2001
From: loki <loki@fakeemail.com>
Date: Sun, 1 Mar 2020 14:06:47 +0100
Subject: [PATCH] Fix default ping_timeout config value

---
 sunshine/config.cpp | 6 ++++--
 sunshine/stream.cpp | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sunshine/config.cpp b/sunshine/config.cpp
index 5a8f6ff5..44230c4a 100644
--- a/sunshine/config.cpp
+++ b/sunshine/config.cpp
@@ -188,8 +188,10 @@ void parse_file(const char *file) {
   int_between_f(vars, "ping_timeout", to, {
     -1, std::numeric_limits<int>::max()
   });
-  stream.ping_timeout = std::chrono::milliseconds(to);
-
+  if(to == -1) {
+    stream.ping_timeout = std::chrono::milliseconds(to);
+  }
+  
   int_between_f(vars, "channels", stream.channels, {
     1, std::numeric_limits<int>::max()
   });
diff --git a/sunshine/stream.cpp b/sunshine/stream.cpp
index 00184b59..48a78c17 100644
--- a/sunshine/stream.cpp
+++ b/sunshine/stream.cpp
@@ -262,10 +262,9 @@ void control_server_t::iterate(std::chrono::milliseconds timeout) {
       {
         net::packet_t packet { event.packet };
 
-        std::uint16_t *type = (std::uint16_t *)packet->data;
+        auto type = (std::uint16_t *)packet->data;
         std::string_view payload { (char*)packet->data + sizeof(*type), packet->dataLength - sizeof(*type) };
 
-
         auto cb = _map_type_cb.find(*type);
         if(cb == std::end(_map_type_cb)) {
           BOOST_LOG(warning)
@@ -424,7 +423,7 @@ void controlBroadcastThread(safe::signal_t *shutdown_event, control_server_t *se
   });
 
   server->map(packetTypes[IDX_INVALIDATE_REF_FRAMES], [&](session_t *session, const std::string_view &payload) {
-    std::int64_t *frames = (std::int64_t *)payload.data();
+    auto frames = (std::int64_t *)payload.data();
     auto firstFrame = frames[0];
     auto lastFrame = frames[1];