Merge remote-tracking branch 'origin/Ghidra_11.3'

This commit is contained in:
Ryan Kurtz 2025-01-08 17:10:31 -05:00
commit 502eea1c22

View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -302,6 +302,7 @@ public abstract class AbstractQueryTableModel<T> extends ThreadedTableModel<T, T
@Override @Override
protected void doLoad(Accumulator<T> accumulator, TaskMonitor monitor) protected void doLoad(Accumulator<T> accumulator, TaskMonitor monitor)
throws CancelledException { throws CancelledException {
Trace trace = this.trace;
if (trace == null || query == null || trace.getObjectManager().getRootSchema() == null) { if (trace == null || query == null || trace.getObjectManager().getRootSchema() == null) {
return; return;
} }