Skip to content

Fix: handle UnsupportedOperationException in SystemTray to prevent cr… #14637

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
KartikeyTripathi469 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Open

Fix: handle UnsupportedOperationException in SystemTray to prevent cr… #14637

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: 11 additions & 7 deletions Mage.Client/src/main/java/mage/client/components/tray/MageTray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ public enum MageTray {

private int state = 0;

public void install() {

public void install() {
Copy link
Copy Markdown
Contributor

@xenohedron xenohedron Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please fix indentation back to how it was

if (!SystemTray.isSupported()) {
log.warn("SystemTray is not supported");
return;
Expand All @@ -40,7 +41,15 @@ public void install() {
frame.setState(Frame.NORMAL);
});

final SystemTray tray = SystemTray.getSystemTray();
// --- YOUR FIX STARTS HERE ---
Copy link
Copy Markdown
Contributor

@xenohedron xenohedron Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for the your fix starts/ends comments

final SystemTray tray;
try {
tray = SystemTray.getSystemTray();
} catch (UnsupportedOperationException e) {
log.warn("SystemTray is supported but not available: " + e.getMessage());
return; // Exit safely if the OS lies about SystemTray support
}
// --- YOUR FIX ENDS HERE ---

final PopupMenu popup = new PopupMenu();

Expand All @@ -52,15 +61,10 @@ public void install() {
MenuItem exitItem = new MenuItem("Exit");

imagesItem.addActionListener(e -> MageFrame.getInstance().downloadImages());

iconsItem.addActionListener(e -> MageFrame.getInstance().downloadAdditionalResources());

stopBlinkItem.addActionListener(e -> stopBlink());

preferencesItem.addActionListener(e -> MageFrame.getInstance().btnPreferencesActionPerformed(null));

aboutItem.addActionListener(e -> MageFrame.getInstance().btnAboutActionPerformed(null));

exitItem.addActionListener(e -> MageFrame.getInstance().exitApp());

popup.add(imagesItem);
Expand Down
Loading