From 510a24644b2ab624f8f6fa43abf12698146d7cda Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Thu, 26 Jan 2023 10:25:42 -0600 Subject: [PATCH] Make titlebar TACNET_PRIMARY (blue) when connected, log tacnet read error. --- lib/states/editor.rb | 5 ++++- lib/tacnet/client.rb | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/states/editor.rb b/lib/states/editor.rb index 854e346..eb6b40d 100644 --- a/lib/states/editor.rb +++ b/lib/states/editor.rb @@ -144,9 +144,12 @@ class Editor < CyberarmEngine::GuiState @last_tacnet_status = window.backend.tacnet.status case window.backend.tacnet.status - when :not_connected, :connected + when :not_connected @tacnet_button.style.color = Gosu::Color::WHITE @header_bar.style.background = 0xff_006000 + when :connected + @tacnet_button.style.color = Gosu::Color::WHITE + @header_bar.style.background = TAC::Palette::TACNET_PRIMARY when :connecting @tacnet_button.style.color = TAC::Palette::TACNET_CONNECTING @header_bar.style.background = TAC::Palette::TACNET_CONNECTING diff --git a/lib/tacnet/client.rb b/lib/tacnet/client.rb index 74c3b91..771b613 100644 --- a/lib/tacnet/client.rb +++ b/lib/tacnet/client.rb @@ -110,23 +110,24 @@ module TAC rescue => error @last_socket_error = error @socket_error = true + log.e(TAG, error.message) + close end end def read begin - message = @socket.gets + message = @socket.gets.strip rescue => error @last_socket_error = error @socket_error = true + log.e(TAG, error.message) + message = "" end - - - return message.strip end def puts(message)