Merge branch 'master' of https://github.com/DevilXD/TwitchDropsMiner
This commit is contained in:
commit
ce9af7b4ba
2 files changed
+12
-1
No files matched your search
@@ -1,2 +1,3 @@
|
|||||||
aiohttp>2.0,<4.0
|
aiohttp>2.0,<4.0
|
||||||
pystray
|
pystray
|
||||||
|
websockets
|
||||||
@@ -49,6 +49,8 @@ from constants import (
|
|||||||
WebsocketTopic,
|
WebsocketTopic,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
from exceptions import MinerException
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from gui import LoginForm
|
from gui import LoginForm
|
||||||
from main import ParsedArgs
|
from main import ParsedArgs
|
||||||
@@ -293,7 +295,15 @@ class Twitch:
|
|||||||
)
|
)
|
||||||
for channel_id in self.channels
|
for channel_id in self.channels
|
||||||
]
|
]
|
||||||
self.websocket.add_topics(topics)
|
|
||||||
|
try:
|
||||||
|
self.websocket.add_topics(topics)
|
||||||
|
except MinerException as err:
|
||||||
|
# don't panic if we have more topics than available sockets
|
||||||
|
# but still log an error
|
||||||
|
logger.error(err)
|
||||||
|
pass
|
||||||
|
|
||||||
# relink watching channel after cleanup,
|
# relink watching channel after cleanup,
|
||||||
# or stop watching it if it no longer qualifies
|
# or stop watching it if it no longer qualifies
|
||||||
watching_channel = self.watching_channel.get_with_default(None)
|
watching_channel = self.watching_channel.get_with_default(None)
|
||||||
|
|||||||
Reference in new issue
Block a user