Skip to content

Commit fd2e568

Browse files
committed
1 parent 1c107fe commit fd2e568

2 files changed

Lines changed: 43 additions & 0 deletions

File tree

src/Classes/ImportTab.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ function ImportTabClass:DownloadCharacterList()
463463
end
464464
end
465465
table.sort(leagueList)
466+
charSelectLeague = self.controls.charSelectLeague
466467
wipeTable(self.controls.charSelectLeague.list)
467468
for _, league in ipairs(leagueList) do
468469
t_insert(self.controls.charSelectLeague.list, {

src/Classes/ImportTab.lua.rej

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
diff a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua (rejected hunks)
2+
@@ -523,11 +523,11 @@ function ImportTabClass:DownloadCharacterList()
3+
if self.lastLeague then
4+
charSelectLeague:SelByValue(self.lastLeague, "league")
5+
-- check that it worked
6+
- if charSelectLeague:GetSelValue("league") ~= self.lastLeague then
7+
+ if charSelectLeague:GetSelValueByKey("league") ~= self.lastLeague then
8+
-- League maybe over, Character will be in standard
9+
standardLeagueName = FindMatchingStandardLeague(self.lastLeague)
10+
self.controls.charSelectLeague:SelByValue(standardLeagueName, "league")
11+
- if charSelectLeague:GetSelValue("league") ~= standardLeagueName then
12+
+ if charSelectLeague:GetSelValueByKey("league") ~= standardLeagueName then
13+
-- give up and select the first entry. Ruthless mode may not have Standard equivalents
14+
charSelectLeague.selIndex = 1
15+
else
16+
@@ -645,7 +645,7 @@ function ImportTabClass:DownloadPassiveTree()
17+
end
18+
self.lastCharacterHash = common.sha1(charData.name)
19+
if not self.lastLeague then
20+
- self.lastLeague = charSelectLeague:GetSelValue("league")
21+
+ self.lastLeague = charSelectLeague:GetSelValueByKey("league")
22+
end
23+
self:ImportPassiveTreeAndJewels(response.body, charData)
24+
end, sessionID and { header = "Cookie: POESESSID=" .. sessionID })
25+
@@ -670,7 +670,7 @@ function ImportTabClass:DownloadItems()
26+
end
27+
self.lastCharacterHash = common.sha1(charData.name)
28+
if not self.lastLeague then
29+
- self.lastLeague = charSelectLeague:GetSelValue("league")
30+
+ self.lastLeague = charSelectLeague:GetSelValueByKey("league")
31+
end
32+
self:ImportItemsAndSkills(response.body)
33+
end, sessionID and { header = "Cookie: POESESSID=" .. sessionID })
34+
@@ -756,7 +756,7 @@ function ImportTabClass:ImportPassiveTreeAndJewels(json, charData)
35+
self.build.spec:BuildClusterJewelGraphs()
36+
self.build.spec:AddUndoState()
37+
if not self.lastLeague then
38+
- self.lastLeague = charSelectLeague:GetSelValue("league")
39+
+ self.lastLeague = charSelectLeague:GetSelValueByKey("league")
40+
end
41+
self.build.characterLevel = charData.level
42+
self.build.characterLevelAutoMode = false

0 commit comments

Comments
 (0)