Weird version data fix.

This commit is contained in:
cora48 2015-03-24 14:15:38 +03:00
parent 0608ae0afa
commit 5de1edc661
2 changed files with 17 additions and 7 deletions

View File

@ -42,11 +42,12 @@ extern unsigned int Activity;
extern char trcSrv[256], trcScr[256], trcProxy[128], trcPersKey[64], extern char trcSrv[256], trcScr[256], trcProxy[128], trcPersKey[64],
trcPort[32], trcSrvPortLine[32], saveEndIP[128], trcPort[32], trcSrvPortLine[32], saveEndIP[128],
gRange[128], gFirstDom[128], gPorts[65536], gRange[128], gFirstDom[128], gPorts[65536],
gVER[16],
gProxyIP[64], gProxyPort[8], gProxyIP[64], gProxyPort[8],
currentIP[MAX_ADDR_LEN], currentIP[MAX_ADDR_LEN],
finalIP[32]; finalIP[32];
extern char gVER[32];
struct pl{ struct pl{
int loginCounter; int loginCounter;
int passCounter; int passCounter;

View File

@ -47,7 +47,7 @@ bool privateMsgFlag = false;
char inputStr[256] = {0}; char inputStr[256] = {0};
bool proxyEnabledFlag = false; bool proxyEnabledFlag = false;
bool disableBlink = false; bool disableBlink = false;
char gVER[16] = {0}; char gVER[32] = {0};
int nickFlag; int nickFlag;
int offlineFlag; int offlineFlag;
bool OnlineMsgSentFlag = false; bool OnlineMsgSentFlag = false;
@ -2545,7 +2545,7 @@ void CreateVerFile()
}; };
} }
const char *GetVer() std::string GetVer()
{ {
int dver = 0; int dver = 0;
int tver = 0; int tver = 0;
@ -2585,8 +2585,14 @@ const char *GetVer()
tver *= 10; tver *= 10;
tver += __TIME__[4] - 48; tver += __TIME__[4] - 48;
char db[32] = {0}; char dverX[16] = {0};
sprintf(db, "%X-%X", dver, tver); char tverX[16] = {0};
sprintf(dverX, "%X", dver);
sprintf(tverX, "%X", tver);
std::string db = std::string(dverX) + "-" + std::string(tverX);
//sprintf(db, "%X-%X", dver, tver);
return db; return db;
} }
@ -2627,7 +2633,10 @@ void _startMsgCheck()
QTime time = QTime::currentTime(); QTime time = QTime::currentTime();
qsrand((uint)time.msec()); qsrand((uint)time.msec());
strcpy(gVER, GetVer());
const std::string &gVERStr = GetVer();
strcpy(gVER, gVERStr.c_str());
QString QVER(gVER); QString QVER(gVER);
ui->logoLabel->setToolTip("v3-" + QVER); ui->logoLabel->setToolTip("v3-" + QVER);
ui->logoLabel->setStyleSheet("color:white; border: none;background-color:black;"); ui->logoLabel->setStyleSheet("color:white; border: none;background-color:black;");