Skip to content

Commit ad47611

Browse files
authored
Merge pull request #6 from MasterFlomaster1/main
Fix for macOS compatibility issue
2 parents 75cca03 + 0d4d277 commit ad47611

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

source/de/quippy/javamod/main/gui/MainForm.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,7 @@ public XmasConfigPanel getXmasConfigPanel()
19051905
if (xmasConfigPanel==null)
19061906
{
19071907
DisplayMode mode = Helpers.getScreenInfoOf(this);
1908-
final int refreshRate = (mode!=null)?mode.getRefreshRate():60;
1908+
final int refreshRate = (mode != null && mode.getRefreshRate() != DisplayMode.REFRESH_RATE_UNKNOWN) ? mode.getRefreshRate() : 60;
19091909
xmasConfigPanel = new XmasConfigPanel(refreshRate);
19101910
xmasConfigPanel.setName("xmasConfigPane");
19111911
}
@@ -1992,7 +1992,7 @@ public SAMeterPanel getSALMeterPanel()
19921992
if (saLMeterPanel==null)
19931993
{
19941994
DisplayMode mode = Helpers.getScreenInfoOf(this);
1995-
final int refreshRate = (mode!=null)?mode.getRefreshRate():60;
1995+
final int refreshRate = (mode != null && mode.getRefreshRate() != DisplayMode.REFRESH_RATE_UNKNOWN) ? mode.getRefreshRate() : 60;
19961996
saLMeterPanel = new SAMeterPanel(refreshRate, 25);
19971997
Dimension d = new Dimension(104, 60);
19981998
saLMeterPanel.setSize(d);
@@ -2009,7 +2009,7 @@ public SAMeterPanel getSARMeterPanel()
20092009
if (saRMeterPanel==null)
20102010
{
20112011
DisplayMode mode = Helpers.getScreenInfoOf(this);
2012-
final int refreshRate = (mode!=null)?mode.getRefreshRate():60;
2012+
final int refreshRate = (mode != null && mode.getRefreshRate() != DisplayMode.REFRESH_RATE_UNKNOWN) ? mode.getRefreshRate() : 60;
20132013
saRMeterPanel = new SAMeterPanel(refreshRate, 25);
20142014
Dimension d = new Dimension(104, 60);
20152015
saRMeterPanel.setSize(d);
@@ -2026,7 +2026,7 @@ public VUMeterPanel getVULMeterPanel()
20262026
if (vuLMeterPanel==null)
20272027
{
20282028
DisplayMode mode = Helpers.getScreenInfoOf(this);
2029-
final int refreshRate = (mode!=null)?mode.getRefreshRate():60;
2029+
final int refreshRate = (mode != null && mode.getRefreshRate() != DisplayMode.REFRESH_RATE_UNKNOWN) ? mode.getRefreshRate() : 60;
20302030
vuLMeterPanel = new VUMeterPanel(refreshRate);
20312031
Dimension d = new Dimension(20, 100);
20322032
vuLMeterPanel.setSize(d);
@@ -2042,7 +2042,7 @@ public VUMeterPanel getVURMeterPanel()
20422042
if (vuRMeterPanel==null)
20432043
{
20442044
DisplayMode mode = Helpers.getScreenInfoOf(this);
2045-
final int refreshRate = (mode!=null)?mode.getRefreshRate():60;
2045+
final int refreshRate = (mode != null && mode.getRefreshRate() != DisplayMode.REFRESH_RATE_UNKNOWN) ? mode.getRefreshRate() : 60;
20462046
vuRMeterPanel = new VUMeterPanel(refreshRate);
20472047
Dimension d = new Dimension(20, 100);
20482048
vuRMeterPanel.setSize(d);
@@ -2073,7 +2073,7 @@ public LEDScrollPanel getLEDScrollPanel()
20732073
if (ledScrollPanel==null)
20742074
{
20752075
DisplayMode mode = Helpers.getScreenInfoOf(this);
2076-
final int refreshRate = (mode!=null)?mode.getRefreshRate():60;
2076+
final int refreshRate = (mode != null && mode.getRefreshRate() != DisplayMode.REFRESH_RATE_UNKNOWN) ? mode.getRefreshRate() : 60;
20772077
ledScrollPanel = new LEDScrollPanel(refreshRate, Helpers.FULLVERSION + ' ' + Helpers.COPYRIGHT + " ", chars, Color.GREEN, Color.GRAY);
20782078
Dimension d = new Dimension((chars*brick*6)+4, (brick*8)+4);
20792079
ledScrollPanel.setSize(d);
@@ -2127,7 +2127,7 @@ private SeekBarPanel getSeekBarPanel()
21272127
if (seekBarPanel==null)
21282128
{
21292129
DisplayMode mode = Helpers.getScreenInfoOf(this);
2130-
final int refreshRate = (mode!=null)?mode.getRefreshRate():60;
2130+
final int refreshRate = (mode != null && mode.getRefreshRate() != DisplayMode.REFRESH_RATE_UNKNOWN) ? mode.getRefreshRate() : 60;
21312131
seekBarPanel = new SeekBarPanel(refreshRate, false);
21322132
seekBarPanel.setName("SeekBarPanel");
21332133
seekBarPanel.addListener(new SeekBarPanelListener()

0 commit comments

Comments
 (0)