Merge branch 'stable-2.6' into stable-2.7
* stable-2.6: Work around MySQL refusing to be case sensitive Reference included plugins by absolute Urls Fix PatchScript's mapping of lines below the last edit Fix refreshing PatchScreen when fileList has not yet been loaded Fix login servlets when canonicalWebUrl is not set
This commit is contained in:
@@ -169,7 +169,9 @@ public class PatchTable extends Composite {
|
||||
}
|
||||
|
||||
public void movePointerTo(final Patch.Key k) {
|
||||
myTable.movePointerTo(k);
|
||||
if (myTable != null) {
|
||||
myTable.movePointerTo(k);
|
||||
}
|
||||
}
|
||||
|
||||
public void setActive(boolean active) {
|
||||
|
||||
@@ -366,7 +366,7 @@ public abstract class PatchScreen extends Screen implements
|
||||
lastScript = null;
|
||||
settingsPanel.setEnabled(false);
|
||||
reviewedPanels.populate(patchKey, fileList, patchIndex, getPatchScreenType());
|
||||
if (isFirst && fileList != null) {
|
||||
if (isFirst && fileList != null && fileList.isLoaded()) {
|
||||
fileList.movePointerTo(patchKey);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user