Skip to content

Fix several issues that prevent the CPD from running properly #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jochenschmich wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix several issues that prevent the CPD from running properly #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/Common/InputSupport/DirectInput/DIDeviceMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,19 @@ public void DIEventMonitorThreadWork()
}
}
}
catch (ThreadAbortException)
catch (ThreadAbortException exception)
{
Log.Error(exception.ToString());
Thread.ResetAbort();
}
catch (ThreadInterruptedException) {}
catch (ThreadInterruptedException exception)
{
Log.Error(exception.ToString());
}
catch (Exception exception)
{
Log.Error(exception.ToString());
}
}
}

Expand Down Expand Up @@ -368,8 +376,9 @@ protected override void Prepare()
Prepared = true;
}
}
catch
catch(Exception exception)
{
Log.Error(exception.ToString());
Prepared = false;
}
finally
Expand Down Expand Up @@ -446,8 +455,9 @@ private void GetNewJoyState()
StateChanged?.Invoke(this, new DIStateChangedEventArgs(_prevState, _state));
}
}
catch
catch(Exception exception)
{
Log.Error(exception.ToString());
Dispose();
Prepared = false;
}
Expand Down
1 change: 1 addition & 0 deletions src/F16CPD/SimSupport/Falcon4/EventHandlers/InputControlEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public InputControlEventHandler(
ISetExtFuelSwitchTransWingFirstEventHandler setExtFuelSwitchTransWingFirstEventHandler=null
)
{
falconCallbackSender = falconCallbackSender ?? new FalconCallbackSender(mfdManager);
_optionSelectButtonPressHandler = optionSelectButtonPressHandler ?? new OptionSelectButtonPressHandler(mfdManager, falconCallbackSender);
_setHsiModeTcnEventHandler = setHsiModeTcnEventHandler ?? new SetHsiModeTcnEventHandler(falconCallbackSender);
_setHsiModePlsNavEventHandler = setHsiModePlsNavEventHandler ?? new SetHsiModePlsNavEventHandler(falconCallbackSender);
Expand Down
2 changes: 1 addition & 1 deletion src/F16CPD/SimSupport/Falcon4/MovingMap/CenterAirplaneRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void DrawCenterAirplaneSymbol(Graphics g, Rectangle renderRectangle)
{
if (_mapAirplaneBitmap == null)
{
_mapAirplaneBitmap = (Bitmap) Resources.F16Symbol.Clone();
_mapAirplaneBitmap = new Bitmap((System.Drawing.Image) Resources.F16Symbol.Clone());
_mapAirplaneBitmap.MakeTransparent(Color.FromArgb(255, 0, 255));
_mapAirplaneBitmap =
(Bitmap)
Expand Down
4 changes: 2 additions & 2 deletions src/F4Utils/Terrain/TileSetConfigValueReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public string TileSetConfigValue
get
{
var configLines = new List<string>();
var configFolder = Path.Combine(_bmsBaseDir, @"\Config");
var bmsConfigFile = Path.Combine(configFolder, "Falcon BMS.config");
var configFolder = Path.Combine(_bmsBaseDir, "User/Config");
var bmsConfigFile = Path.Combine(configFolder, "Falcon BMS.cfg");
using (var sr = new StreamReader(bmsConfigFile))
{
while (!sr.EndOfStream)
Expand Down