Skip to content

fix: Diff画面でデータが表示されない問題を修正 #243

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

Merged
funa-tk merged 1 commit into from
May 21, 2026
+3 −3
Merged

fix: Diff画面でデータが表示されない問題を修正 #243

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
6 changes: 3 additions & 3 deletions src/main/java/core/packetproxy/gui/GUIData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ private byte[] resolveDataForCopyBody() throws Exception {
*/
private byte[] resolveDataForDiff() throws Exception {
if (!GUIHistory.getInstance().isSelectedRowMerged()) {
return tabs.getRaw().getData();
return getActiveData();
}
// macOS の JOptionPane はボタンを右から左に描画するため、
// 視覚的に左から「Request | Response」の順にするには逆順で定義する。
Expand All @@ -581,7 +581,7 @@ private byte[] resolveDataForDiff() throws Exception {
if (choice == JOptionPane.CLOSED_OPTION)
return null;
if (choice == 0)
return GUIPacket.getInstance().getResponsePacket().getReceivedData();
return tabs.getRaw().getData();
return responseDataProvider != null ? responseDataProvider.get() : null;
return getActiveData();
}
}
Loading